Further generalization.

Statistic params needs fixing.