Changed mutable dictionaries to NSDictionaries