minor changes - will need to remove the pgsql alias or check for it before adding it..