Migrating to new version of NPS Bootstrap