Change storage type from NSMutableArray to NSMutableDictionary