Added sensible defaults for dates