Changes to external classes