Refactored compound indexer
Refactored compounds indexing