Added Connection pool support