Added primary key for elements