Updated helpers to include macro ait method.