Add support for catch all method