Refactoring - Indexer API, Document API, CMS - wip