Update to fix metrics