Update to use forked helpers