Fix single case and add connect option