Updated ObjectMap to 2.0