significant applicationManager refactoring