Upgrade API a bit