Changes to the way registry is accessed