Improved OOP paradigm