Adding index and work on doc specs