Added DataSourceFactory.
Simplified DataSourceFactory.