DateHandling improved