Moved functionality to RectModel