feature/dictionaries