2.x update

I agree map would be sufficient here.