Added more OOP stuff