Updated structure of mixins