Switch to use Ouptut/JsonOutput