Updated to address closing of a pooled embeded datasource