Use client 'six' data structs for client 'seven' data

Use client 'six' data structs for client 'seven' data #42