Added support for multiple data sources