Added support for index names