Updates to createEntity and entity.fetch