! Partial commit !
- Removed unnecessary model entities
- Added result count