Use proper source delegation for set and JSON serialization