Fixed the metric classes to work correctly