Added generation of master address