Chaging to IdentityHashMap