Fixed IndexFactory return value types