Updated metrics to use the logging