Allow SUPPORT_KIWI flag to be passed in