Change inner mapper too to use subpop number as key