Finishing changes on AppManager