Added more class