Fix error messages
Add DocumentCollection generator