1.1 Name and 1.2 Address code refactor