Brought IntMap up to date