Add indexPlusOne support