Added DAL, Indexer