Changed implementation of the Pool