Updates for 0.1.7. Rename mixins to mixin implementaionts