more changes for supporting List/Map/Set params