Augmenting Geometric Deep Learning for CAD Analysis