Adding addresses

Change-Id: Ifd8ad2e15d2c066c74c98bd62a99e27269638d78