Minor modification to against the change of backend service