Added JSON and HTML reporting