Added client side js generation