adapted to new UnitGUID format