Changed the inheritance chain for controllers so that it is more comprehensive.