Extracted adding to dictionary methods
Refactor implementation and change dictionary class name