Add server config, and fix the XML creation