More changes to ProductStatsCalculatorImpl.java