Reduce UoA dependency