Replaced ObjectHash with ObjectMap