Added indexer beans and modified IndexerManager to use them..
Merge origin/master