Adding multiple flavor support