Added more default classes