Updated AppController