Add support for more metacharacters