Use lists instead of dict to allow mixed identifier types