Modified to ensure data source is retrieved properly when running in non-clustered mode