[UPDATED] NSObject-ObjectMap to 2.1