added metrics support