Improved OutputManager