Add support for OS flavors
6 files changed