Add "unused" element handling