Moved the entity factory interface