Fixed lib imports
Fixed immutable NSDictionaries