Added address and friends field