Upgraded Code Gen plugin
Updated Targets to comply / take advantage of new Code Gen features