Added legacy CAD geometry