Updated Number and Date validation forms