UCTAI improvements