Datafile made optional
Per-point timestamps