Updated as AppManager introduced