Added Output

Just a bridge so we can change the output class easily in the future
and another small changes.