Fix: Use externalid instead of name in Map