Cleanup adding some Json stuff