Added OOP