Adding mixins for type treatment