Added changes to Configuration class