Added output support