Re-worked fix based on feedback - use Deathwatch instead of introducing
a new case class