Adjusted MapItem deferreds and added trees