Add run/stop/restart