Update to new properties management in code generator

Change-Id: I1d97ed5b0057b025653ddb475e9efd37575ab998