Added more mixins