added support for DataSource injection