Adding feature for closing datasource connection