Added the possibility to generate dictionaries