Add collection apidoc conversions
Refactor a bit