Mixin changes

- Changed the mixin calls to be more standard.
- Bumped version.