Added product state classes