New version of CLT with component support built in.