Added more class names