isolate usages of Application class
refactor