Simplify JSON support