Added client aware interface