Add two new mixins
Update version