Changes to generic and index