Replaced deprecated @Data annotations. Removed some redundant extension
fields.