Add updated mixins