Added better checks for postal code and date