Updated to support collections out of the box