adding TrackingId and moving to DateTimeOffset