OOP adjustments