Added some more patterns to match against.