@wjw_add: Added support for collection types!