Now supports MethodNotAllowed correctly