Updated ApplicationHelper