A number of updates to handle JSON examples and authored examples.