Add support for .catchall