Mixins update