Better output handling support