Added collections. Fixes #90, #8