Added some more output variables.