Add support for metrics