Refactoring profile and register
Refactoring register
Refactoring register