added support for lists, set and maps