Date handling update