Started mixin refactoring