Add configurability for factory/resolver. Renames.