Add client side handling