Adding support for other types of regular expressions