v1.3 refactor dictionary