UAC and UAS feature complete