Added hiccup output support.