Refactor of model
Entities fetch type eager for detached use