Remove direction from datasource class