Convert the rest of API to new format