Better handling of timestamps