Added article indexer and required modifications