Add 'list' collection support
cleanup