Added output generation