Addition of DateTime handling