Made some changes in Pool module