Added support for generating naojure output