Switch to int map