Updated handling of helpers for 2.4