Added support for index naming