Raw dictionaries interaction with the system done
Merge conflicts fixed