Added support for multiple data sets