Increased JSON implementation