Upgrade API enhancement