Added address group and changed some fields