Added transactional context to Datastore