Registry refactoring