Tweak JSON serialization