Add simple-map, remove zero pops