Marshall to JSON better