Added support for metrics