Better handling of times