Enhance compatibility with flowd module