Refactored element id