Update to new cfg syntax