Updates to maintain account address details (manually copied from the
work Rob did)