added IndexModule changes