Added ann.graph.index component. Reduced code complexity