Change API design to the current one documented on the wiki.