Better handling of timestamps

UTC offset not yet handled