Refactored around appName