Oops, forgot new util.Registry