Upgrade API support

Closes #1040