Added code for address updates