refactored Address as 1-to-1 relationship