Add cpp and cmake role
Remove cpp role
Update