Finished updating CSPOM Patterns to new API