Added JSON support
Add JSON output for a couple of pages