Add client base
Add binary_values