added a tunneled datasource wrapper