Validator #31 for new metrics #45