Feature/address and address user update

b9a3cbdc95e9ecd68bd42cd589908d6a1b6b9e7b