Updated DataSourceFactory service registration