Changed key/value output method for output data