Added Auto-Start/-Stop Mechanism