Continued work in porting DocGenerator to CCI