Added json generation