Update for recent configuration changes