Main OOP classes added