Update on address generation