Added methods needed for non-database datasource