Added changes to parse configuration file