Added classes for metrics