Sync with new format of api