Converted OutputGenerator methods to module level functions