Refactor ApplicationHelper