Added support for indexing