Add some type hints to datastore.