Replace registry2 properties with just registry