More work on Collection+JSON