Adds several more usages for regexp