Changes to controller base