add uuap support