Adding index.hh support