Completed AppToken and App2 types