Update index view to generic