There were a few cases where datasource names would fail to work. Updated the code that instanciates datasources to handle some cases.
There were a few cases where datasource names would fail to work. Updated the code that instanciates datasources to handle some cases.

Masterminds/Fortissimo,Masterminds/Fortissimo