Mixin updates