Refactor models for better readability

**Description**
Currently handlers lacks proper analytics support.

**Proposed solution**
Add configurable analytics with sensible defaults.

**Priority**: Low/Medium

Start by locating the handlers mentioned in the issue and read how analytics is currently handled. Determine the configuration surface and sensible defaults from the existing code; the work is done when handlers support configurable analytics with those defaults, though the issue does not name specific files or tests.

Written by the indexing model from the issue text.