Improve OOP