Add UnionTuner support