Add server -side validation and modified client side- validation