Updates to mixins