Added support for all flavors