EXTAPI-89 moved helper methods to helpers class