Registry refactoring ...
Registry refactoring ...