Add Cupcake class and Heart class