Updated to reflect recent changes in GWM helpers