Map<> support, part 2