Refactor entity_types