Refactored element structure