Adding confit changes to resolve import/config protocols more efficiently