Add client utility classes