Add role to App and better parsing