Edited map.
Now holds all objects along with ID map