improved support for indexes