Some more abstraction in the output classes