Added switches to make commands more log-friendly