Added CLIENT:ADDRESS handling