Added client state support.