Added flavor support