Core CAD enhancements

Core CAD enhancements