Entity SP: models rework started