Date handling updated