Working on subscription upgrades