Update ApexController and DashboardController