adding metrics support