Adding in more client structure.