change to JSON serialization