Better handling of duration and date