Add basic metric checks and handlers