Moved collection contents to be a property of a collection. Thus we
can always return a JSON object as the outer container.