Refactor: Extract to support