change IntMap to ObjectMap