Switched to collection+JSON format #7