Write collection module fixes #91