Added support for indexes