Modifications to UnitBuilder (new id is from Map class)