New way to handle metrics