replace ListType and DictionaryType by list and dict