Add JSON data dumps
Make import script a little more robust