Added more class samples