Fixed up Registry to work