Add support for indirect UC/CC

Signed-off-by: Michael Buesch <m@bues.ch>