Adding support for single Array and Collection Types