- added classes into mixin