FORGE-1097: Multiple fields are split into their own FieldDeclarations