Added DirtyTracking for timestamps