Updated client side validation