Finish client side integration