Added support for passing additional data into datasources