Add pool handling