Migrating to Amazon IAP v2.0