Make API compliant with Collection+JSON