Added changes for index view generation