Add client side support