Added support for more collection types