Replaced NSArray into NSDictionary and removed string parsings.

I have changed the way you parsed the modifiers. If you would like to
accept the commit, then go on. I hope this would be elegant and easy
for developers to code don't break anywhere. Hope to see your reply.