Make the implementation more robust by only overriding what is really needed in the Controller classes

Problem/Motivation

Currently the two controller classes copy over the full contents of their parent class.

Proposed resolution

Only override the methods that need to change, call parent method where possible.

This would make the code more resilient to changes in core.