Added support to index collections