Added some more properties to control output.