Added mixins, fixed production task bug