Make custom entity datasource agnostic
Define custom entity datasource as agnostic