Implemented more OOP functionality