AdressGenerator and many changes