Mixins and functions added