Add support for "stopped" and "restarted"