Added support for datasource stats