Added QueryControlller and ExceptionController