Add JSON implementation data, update query language to agree