Update ETL to use zipmap on each entry to get a hash-map