Improve OOP.