Update App Based on PR - Add a Few Validations