Moving to new XmlFileConfiguration for better module handling