Adding dependencies, cleaning dictionaries