Return model instead of entity