Added json output as an option