Switching to classes for controllers