#55 Allows multiple output types without accumulated naming changes