Changed handling for Configuration xml file