Updated Application Controller