Added hasEntities() to Datasource