Add proper support for Flex
Hearthstone support