Better handling of timestamps and multiple parents