Change dependency
Removing CmdArgs
Fix dictionary reading