Added support for collection types.