Adding support for multiple data sources.