Changed controller definitions to work with code minimization