Refactored TimeComponents