Added client, volunteer, and org classes