Adding the address
Refactoring