Adaptation to new configuration scheme