Update mixins and structure