Refactor PumpList before adding map/list swapping