Two smaller issues, nothing critical
I don't think GenerateProperties is useful here. We don't use the property system in the generated class.
I guess this TODO comment can go with your change.
Take in consideration ervin feedback
fix