Introduce the id attributes into the top level entries