Add better date validation