Customizations for CWS clients