Added two mixins