Add multi output support