Add changes made to support new service call and test cases