[fx] dictionaries reorganization