Improved version of MapObject