Also added ConectionPool.singleton for DataSourceCP