Changes to add dbms type and port & rename db vars for multi-dbms