Smidsy. Update reporting to use new categories