Added support for IndexMaybe (untested)