Upgrade API to version b3
Upgrade API to version b4
Fix values