Added class verification for batch view