Upgrade to ApplicationHelper 2.7