Added function generation
Yes