Changes to requiring classes