Add support for Collection type so that it's treated as an array