Added support for cundd_composer