Refactored Components