Added more properties to Address