Adding client side routing