Ported to new interface in config