Get rid of configuration file
Changed parsing xml