Added pool support