Refactoring register - change other fields