Add option for catch all