Start moving everything to the new API

"key type" instead of "format"?