Add Id field to Node structs