Regenerated JSON dicts properly I hope