Replace remaining dicts with arrays