Now uses generic connection string