Small changes in Configuration class