+Nishant - moved model logics inside models