Switch to 'controller as' syntax; wrap reference data in class;