Refactor Registration record