Refactors to use actual Arrays for collection responses