Refactor AppManifest