Refactor AppParser