Upgrade API version to 31.0