You are right, I am going to move them from base.Calculator to BaseHazardCalculator