Enhance Flex coverage