Some extended mixins were added.