Add more count estimation to more areas of code