Don't use mutable dictionaries where they are not needed
Merge pull request #936 from rivera-ernesto/mutable_dictionaries

Don't use mutable dictionaries where they are not needed