Added DataSourceName struct