Moved mixins to separate file