refactor, add applicationValidator