Add support for client side links