refactoring to use libCCDAGen library