Bring the registry back and remove later if not used everywhere