reorganized how data is being resolved for the app controller