CADDi

Latest CADDi coverage.