improved objectmap

reworked main logic to fit new object map