Replaced controllers with mixins