Moved to independants rules as entities
Changed query to subjects as we have relation with model
Renamed methods