Changed switch case for metrics