Changes to structure and class terms