[ADD] Add basic support for list and map types