Server side code : PatchV5
Client side changes for Generic Service creation