Refactored extensions