Add more CDH 4.4 components.