Updated indexer and database schema