Added json formatting