Yes, I added the innerMap for that. Also, it helps avoid the fragile base class problem.