Updated mixins, simplified structure