Better monitoring of the risk calculators

Small additions to see the differences between before and after the refactoring of the risk calculators.