Update to use mixins