Updated Output class