More configuration changes