Added json and xml output