Added new mixins