More changes on configuration