Add FQ metric support