Catch-up with the new generation style.
Merge pull request #1 from Cloudrisk/develop @type/@model generation now compatible with the new generation
Merge pull request #1 from Cloudrisk/develop @type/@model generation now compatible with the new generation