More classes added