Added more product classes