Added dynamic checks to construct the  string based on what configuration options were set in PSQLConfiguration