final update now supports helpers as well