Builtin registry support in place