Changed VanillaRegistry to CoreRegistry