Added several classes (especially ArcShape)