Add support for various metrics