support DictField/MapField
more DictField/MapField updates