Refactored pool state