Added flexibility with connection credentials