enhancements to indexor