Added 'set's to json encoder