Changes to extensions classes