Map objects
Merge pull request #1473 from Duny-/Defficiency

Unfucking Efficiency
Merge pull request #1474 from wild-billy/map_objects

Map objects