Refactored PoolHandler