Updated NSArray to work with new Id.
Updated NSDictionary to work with the new Id.
Implemented Map for NSDictionary.
Updated NSEnumerator to work with the new Id.