Added additional options to each metric type.