Minor dictionaries refactoring
v 0.1.1