Improve client side support