Added output option