Updated mixins to v1.0.0