Refactor extensions