Minor code refactoring.
Add rectangleROI to ROI collection.