Upgrade API to version 31.0