Added json and html output