EAP6-18: Add element IDs