Added MapEntry and MapEntryList.