Added more configuration changes