Some entities are refactored