Migrated to latest version of NuPattern