Mixins added and optimized