Added commarch stuff to yaml