Add data/files collection support
Merge pull request #9 from egeloen/data-and-files-collection

Add data/files collection support