Added more to address generation code.