Added some OOP concepts