Add missing fields, including entity IDs