Refactored component structure