Move Client Config to XML