Registry refactoring ...