Modifications to dictionary handling.
Request refactoring 1