Added more info for App and Device