HotFix: Fixing merge conflict to enable collections
Merge pull request #272 from javierluraschi/CollectionsHotFix

HotFix: Fixed merge conflict to enable collections