Adds mapping processing to EventCommandMap and DirectCommandMap