Refactoring pool router support