Updated Flavor class