Various classes added