Updated pooling system for auto create