Added collection memberships to ZIP export format
Cleanup