Further tuning of helpers API