More separation between SDO server and client (refactoring only)