Add json and node support