Add product flavors support