Adding CMS Server and Client