Add support for external indexes