Refactor mixins
Refactor mixin import