Added from ApplicationHelper, refactored