Updated to match latest schema - included ids in a dict