Added function generation strategy flag support