Update approach to use mixins