Got DSL working, replaced RectangleAreas with EnhancedRectangles