Cleanup restart logic in monitor
Add typed RestartPolicy