Changes to traits and interfaces