switch API to be compatible with original service