Added categoryCount
Renamed to prevent conflicts
Added isEmpty flag
Added isEmpty ans itemCount helpers