Updating following rewrite for json output