Updated handler to match metrics overhaul