Move mixins to classes and extended them