@Cadair, the prior way that was done was straight from the previous map implementation (through cond dispatch).  Why was it changed?