Add support for multiple data sources inside a stack