Adjust API ordering