Added support for more metrics types