OOP revamp