Before switching over to NSMutableDictionary