New OOP structure.