Added additional vars to output