Modified AddContent & Indexer