ISSUE2 - Class properties added to generated code.
Merge with origin