Update of Demonstration output to include JSON