Add MapObject, rename