Update to modern config