pooled datasource related changes