Adapt to new config