Updated the mixins a bit