Updated mixins