Switch Marshall to JSON