Added client_side_validation