Refactor on ApplicationModel and the Logger