Refactored components