Fixed up Registry + COnfigurations