Add new class PositionedRectangle
Update classes