Registry Improvements