Use id to iterate instead hardcoded type