Improved harvesting and added card class