Fixed model attributes
Extraced more logic into mixins