Added client address component