Add repo attribute and remove id