A few classes added