core changes to classes and helpers