Add start/stop management