Update OOP Structure