Update to OOP way