Add client side implementation