add dictionary support.