Modify: Enhance stability of EDCClient
Modify: Draft modify of EDCServer for Schema change