Added what will be OOP support