Changes to hooks and classes