Fixed: Add metrics