Add entities
Refactor