Application management + various refactorings