Updated multiple-datasources to suppport dynamic connections