Added support for expected metrics