refactored the entity assembly