Added additional mixins