Call UAC and UAS refactorization