Update config to newer layout