improve map-switch signature