Added IAP support