Better handling of time