VP-79 Refactored: moved to API
Merge pull request #48 from dlu-gs/hotfix/vp-79-indexing-state-change

VP-79 Refactored: moved to API