Changes between Version 27 and Version 28 of i2b2 Onyx Ontology v2


Ignore:
Timestamp:
09/12/13 11:09:40 (11 years ago)
Author:
Richard Bramley
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • i2b2 Onyx Ontology v2

    v27 v28  
    881. '''DUMMY''' Start Dates: these are where a start date does not really apply to the value being recorded.  For example, if no relevant date is recorded or a date is not meaningful - such as for gender.
    99
    10 '''Onyx - ONX-00001'''
    11 
    12 * '''Participant - ONX-00002'''
    13  * '''Discharges From Hospital - ONX-00003''' (Node for each method)
    14   * '''Home - ONX-00004'''
     10'''Onyx - ONXv2:00001'''
     11
     12* '''Participant - ONXv2:00002'''
     13 * '''Discharges From Hospital - ONXv2:00003''' (Node for each method)
     14  * '''Home - ONXv2:00004'''
    1515   * ![ConclusionQuestionnaire : epi_dischmeth.Home]
    1616    * Start Date '''DUMMY''': ![ConclusionQuestionnaire:QuestionnaireRun.timeStart]
    1717    * Modifier: 'Recruiting period of care'
    18   * '''Other_hospital - ONX-00005'''
     18  * '''Other_hospital - ONXv2:00005'''
    1919   * ![ConclusionQuestionnaire : epi_dischmeth.Other_hospital]
    2020    * Start Date '''DUMMY''': ![ConclusionQuestionnaire:QuestionnaireRun.timeStart]
    2121    * Modifier: 'Recruiting period of care'
    22   * '''Convalescence - ONX-00006'''
     22  * '''Convalescence - ONXv2:00006'''
    2323   * ![ConclusionQuestionnaire : epi_dischmeth.Convalescence]
    2424    * Start Date '''DUMMY''': ![ConclusionQuestionnaire:QuestionnaireRun.timeStart]
    2525    * Modifier: 'Recruiting period of care'
    26   * '''Death - ONX-00007'''
     26  * '''Death - ONXv2:00007'''
    2727   * ![ConclusionQuestionnaire : epi_dischmeth.Death]
    2828    * Start Date '''DUMMY''': ![ConclusionQuestionnaire:QuestionnaireRun.timeStart]
    2929    * Modifier: 'Recruiting period of care'
    30   * '''Other_specialty - ONX-00008'''
     30  * '''Other_specialty - ONXv2:00008'''
    3131   * ![ConclusionQuestionnaire : epi_dischmeth.Other_specialty]
    3232    * Start Date '''DUMMY''': ![ConclusionQuestionnaire:QuestionnaireRun.timeStart]
    3333    * Modifier: 'Recruiting period of care'
    34   * '''Unknown - ONX-00008'''
     34  * '''Unknown - ONXv2:00008'''
    3535   * ![ConclusionQuestionnaire : epi_dischmeth.Unknown]
    3636    * Start Date '''DUMMY''': ![ConclusionQuestionnaire:QuestionnaireRun.timeStart]
    3737    * Modifier: 'Recruiting period of care'
    38  * '''Consent for Further Contact - ONX-00001''' (Enumerated Value)
     38 * '''Consent for Further Contact - ONXv2:00001''' (Enumerated Value)
    3939  * ![ManualConsentQuestionnaire : Does the participant consent to further contact from BRU?]
    4040   * Start Date: ?
    41  * '''Age - ONX-00001'''
    42  * '''Gender - ONX-00001'''
    43  * '''Ethnicity - ONX-00001'''
    44  * '''Recruitment Type - ONX-00001'''
    45  * '''Vital Status - ONX-00001'''
    46 
    47 
    48 * '''Symptoms - ONX-00001''' (Leaf per symptom)
    49  * '''Shortness of Breath - ONX-00001'''
     41 * '''Age - ONXv2:00001'''
     42 * '''Gender - ONXv2:00001'''
     43 * '''Ethnicity - ONXv2:00001'''
     44 * '''Recruitment Type - ONXv2:00001'''
     45 * '''Vital Status - ONXv2:00001'''
     46
     47
     48* '''Symptoms - ONXv2:00001''' (Leaf per symptom)
     49 * '''Shortness of Breath - ONXv2:00001'''
    5050  * ![DataSubmissionQuestionnaire : epi_symptoms.Shortness_of_Breath]
    5151   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    5252   * Modifier: 'Recruiting period of care presenting symptoms'
    53  * '''Collapse - ONX-00001'''
     53 * '''Collapse - ONXv2:00001'''
    5454  * ![DataSubmissionQuestionnaire : epi_symptoms.Collapse ]
    5555   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    5656   * Modifier: 'Recruiting period of care presenting symptoms'
    57  * '''Syncope - ONX-00001''' 
     57 * '''Syncope - ONXv2:00001''' 
    5858  * ![DataSubmissionQuestionnaire : epi_symptoms.Syncope ]
    5959   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    6060   * Modifier: 'Recruiting period of care presenting symptoms'
    61  * '''Chest_Pain - ONX-00001'''
     61 * '''Chest_Pain - ONXv2:00001'''
    6262  * ![DataSubmissionQuestionnaire : epi_symptoms.Chest_Pain ]
    6363   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    6464   * Modifier: 'Recruiting period of care presenting symptoms'
    65  * '''Palpitations - ONX-00001'''
     65 * '''Palpitations - ONXv2:00001'''
    6666  * ![DataSubmissionQuestionnaire : epi_symptoms.Palpitations ]
    6767   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    6868   * Modifier: 'Recruiting period of care presenting symptoms'
    69  * '''Cardiac_Arrest - ONX-00001'''
     69 * '''Cardiac_Arrest - ONXv2:00001'''
    7070  * ![DataSubmissionQuestionnaire : epi_symptoms.Cardiac_Arrest ]
    7171   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    7272   * Modifier: 'Recruiting period of care presenting symptoms'
    73  * '''Dizziness - ONX-00001'''
     73 * '''Dizziness - ONXv2:00001'''
    7474  * ![DataSubmissionQuestionnaire : epi_symptoms.Dizziness ]
    7575   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    7676   * Modifier: 'Recruiting period of care presenting symptoms'
    77  * '''Epigastric_symptoms - ONX-00001'''
     77 * '''Epigastric_symptoms - ONXv2:00001'''
    7878  * ![DataSubmissionQuestionnaire : epi_symptoms.Epigastric_symptoms ]
    7979   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    8080   * Modifier: 'Recruiting period of care presenting symptoms'
    81  * '''Leg_Pain_on_Walking - ONX-00001'''
     81 * '''Leg_Pain_on_Walking - ONXv2:00001'''
    8282  * ![DataSubmissionQuestionnaire : epi_symptoms.Leg_Pain_on_Walking ]
    8383   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    8484   * Modifier: 'Recruiting period of care presenting symptoms'
    85  * '''Nausea_Vomiting - ONX-00001'''
     85 * '''Nausea_Vomiting - ONXv2:00001'''
    8686  * ![DataSubmissionQuestionnaire : epi_symptoms.Nausea_Vomiting ]
    8787   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    8888   * Modifier: 'Recruiting period of care presenting symptoms'
    89  * '''Paresthesia - ONX-00001'''
     89 * '''Paresthesia - ONXv2:00001'''
    9090  * ![DataSubmissionQuestionnaire : epi_symptoms.Paresthesia ]
    9191   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    9292   * Modifier: 'Recruiting period of care presenting symptoms'
    93  * '''Side_Weakness - ONX-00001'''
     93 * '''Side_Weakness - ONXv2:00001'''
    9494  * ![DataSubmissionQuestionnaire : epi_symptoms.Side_Weakness ]
    9595   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    9696   * Modifier: 'Recruiting period of care presenting symptoms'
    97  * '''Slurred_Speech - ONX-00001'''
     97 * '''Slurred_Speech - ONXv2:00001'''
    9898  * ![DataSubmissionQuestionnaire : epi_symptoms.Slurred_Speech ]
    9999   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    100100   * Modifier: 'Recruiting period of care presenting symptoms'
    101  * '''Sweating_Clammy - ONX-00001'''
     101 * '''Sweating_Clammy - ONXv2:00001'''
    102102  * ![DataSubmissionQuestionnaire : epi_symptoms.Sweating_Clammy ]
    103103   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    104104   * Modifier: 'Recruiting period of care presenting symptoms'
    105  * '''Tiredness_Lethargy - ONX-00001'''
     105 * '''Tiredness_Lethargy - ONXv2:00001'''
    106106  * ![DataSubmissionQuestionnaire : epi_symptoms.Tiredness_Lethargy ]
    107107   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
    108108   * Modifier: 'Recruiting period of care presenting symptoms'
    109  * '''Additional Symptoms - ONX-00001''' (''Potential future target for NLP'')
     109 * '''Additional Symptoms - ONXv2:00001''' (''Potential future target for NLP'')
    110110  * ![DataSubmissionQuestionnaire : epi_symptomother_cat.OPEN_TEXT.OPEN_TEXT_SECDIAGOTHER]
    111111   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]  > ?
     
    113113
    114114
    115 * '''Diagnoses - ONX-00001''' (Folder per diagnosis.  Then each folder has a 'Y', 'N', 'Prefer not to answer' & 'Don't know')
    116  * '''Troponin_pos_ACS- ONX-00001'''
     115* '''Diagnoses - ONXv2:00001''' (Folder per diagnosis.  Then each folder has a 'Y', 'N', 'Prefer not to answer' & 'Don't know')
     116 * '''Troponin_pos_ACS- ONXv2:00001'''
    117117  * ![DataSubmissionQuestionnaire : epi_pridiag.Troponin_pos_ACS]
    118118   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    121121   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    122122   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    123  * '''Troponin_neg_ACS- ONX-00001'''
     123 * '''Troponin_neg_ACS- ONXv2:00001'''
    124124  * ![DataSubmissionQuestionnaire : epi_pridiag.Troponin_neg_ACS]
    125125   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    128128   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    129129   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    130  * '''Acute_Arterial_Occlusion- ONX-00001'''
     130 * '''Acute_Arterial_Occlusion- ONXv2:00001'''
    131131  * ![DataSubmissionQuestionnaire : epi_pridiag.Acute_Arterial_Occlusion]
    132132   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    135135   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    136136   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    137  * '''Acute_Stent_Thrombosis- ONX-00001'''
     137 * '''Acute_Stent_Thrombosis- ONXv2:00001'''
    138138  * ![DataSubmissionQuestionnaire : epi_pridiag.Acute_Stent_Thrombosis]
    139139   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    142142   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    143143   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    144  * '''Aortic_Aneurysm - ONX-00001'''
     144 * '''Aortic_Aneurysm - ONXv2:00001'''
    145145  * ![DataSubmissionQuestionnaire : epi_pridiag.Aortic_Aneurysm]
    146146   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    149149   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    150150   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    151  * '''Aortic_Dissection- ONX-00001'''
     151 * '''Aortic_Dissection- ONXv2:00001'''
    152152  * ![DataSubmissionQuestionnaire : epi_pridiag.Aortic_Dissection]
    153153   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    156156   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    157157   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    158  * '''Aortic_Infective_Endocarditis- ONX-00001'''
     158 * '''Aortic_Infective_Endocarditis- ONXv2:00001'''
    159159  * ![DataSubmissionQuestionnaire : epi_pridiag.Aortic_Infective_Endocarditis]
    160160   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    163163   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    164164   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    165  * '''Aortic_Regurgitation- ONX-00001'''
     165 * '''Aortic_Regurgitation- ONXv2:00001'''
    166166  * ![DataSubmissionQuestionnaire : epi_pridiag.Aortic_Regurgitation]
    167167   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    170170   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    171171   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    172  * '''Aortic_Stenosis- ONX-00001'''
     172 * '''Aortic_Stenosis- ONXv2:00001'''
    173173  * ![DataSubmissionQuestionnaire : epi_pridiag.Aortic_Stenosis]
    174174   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    177177   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    178178   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    179  * '''Arrythmogenic_Right_Ventricular_Cardiomyopathy- ONX-00001'''
     179 * '''Arrythmogenic_Right_Ventricular_Cardiomyopathy- ONXv2:00001'''
    180180  * ![DataSubmissionQuestionnaire : epi_pridiag.Arrythmogenic_Right_Ventricular_Cardiomyopathy]
    181181   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    184184   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    185185   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    186  * '''Atrial_Ectopics- ONX-00001'''
     186 * '''Atrial_Ectopics- ONXv2:00001'''
    187187  * ![DataSubmissionQuestionnaire : epi_pridiag.Atrial_Ectopics]
    188188   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    191191   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    192192   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    193  * '''AF - ONX-00001'''
     193 * '''AF - ONXv2:00001'''
    194194  * ![DataSubmissionQuestionnaire : epi_pridiag.AF]
    195195   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    198198   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    199199   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    200  * '''Atrial_Flutter - ONX-00001'''
     200 * '''Atrial_Flutter - ONXv2:00001'''
    201201  * ![DataSubmissionQuestionnaire : epi_pridiag.Atrial_Flutter]
    202202   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    205205   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    206206   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    207  * '''Haemorrhagic_Stroke - ONX-00001'''
     207 * '''Haemorrhagic_Stroke - ONXv2:00001'''
    208208  * ![DataSubmissionQuestionnaire : epi_pridiag.Haemorrhagic_Stroke]
    209209   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    212212   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    213213   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    214  * '''Thrombotic_Stroke - ONX-00001'''
     214 * '''Thrombotic_Stroke - ONXv2:00001'''
    215215  * ![DataSubmissionQuestionnaire : epi_pridiag.Thrombotic_Stroke]
    216216   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    219219   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    220220   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    221  * '''Cardiac_Arrest - ONX-00001'''
     221 * '''Cardiac_Arrest - ONXv2:00001'''
    222222  * ![DataSubmissionQuestionnaire : epi_pridiag.Cardiac_Arrest]
    223223   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    226226   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    227227   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    228  * '''Cardiac_Tamponade - ONX-00001'''
     228 * '''Cardiac_Tamponade - ONXv2:00001'''
    229229  * ![DataSubmissionQuestionnaire : epi_pridiag.Cardiac_Tamponade]
    230230   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    233233   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    234234   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    235  * '''Cardiogenic_Shock - ONX-00001'''
     235 * '''Cardiogenic_Shock - ONXv2:00001'''
    236236  * ![DataSubmissionQuestionnaire : epi_pridiag.Cardiogenic_Shock]
    237237   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    240240   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    241241   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    242  * '''DVT - ONX-00001'''
     242 * '''DVT - ONXv2:00001'''
    243243  * ![DataSubmissionQuestionnaire : epi_pridiag.DVT]
    244244   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    247247   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    248248   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    249  * '''Type_I_Diabetes - ONX-00001'''
     249 * '''Type_I_Diabetes - ONXv2:00001'''
    250250  * ![DataSubmissionQuestionnaire : epi_pridiag.Type_I_Diabetes]
    251251   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    254254   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    255255   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    256  * '''Type_II_Diabetes - ONX-00001'''
     256 * '''Type_II_Diabetes - ONXv2:00001'''
    257257  * ![DataSubmissionQuestionnaire : epi_pridiag.Type_II_Diabetes]
    258258   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    261261   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    262262   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    263  * '''Dilated_Cardiomyopathy- ONX-00001'''
     263 * '''Dilated_Cardiomyopathy- ONXv2:00001'''
    264264  * ![DataSubmissionQuestionnaire : epi_pridiag.Dilated_Cardiomyopathy]
    265265   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    268268   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    269269   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    270  * '''1st_DHB- ONX-00001'''
     270 * '''1st_DHB- ONXv2:00001'''
    271271  * ![DataSubmissionQuestionnaire : epi_pridiag.1st_DHB]
    272272   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    275275   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    276276   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    277  * '''2nd_DHB_MT1- ONX-00001'''
     277 * '''2nd_DHB_MT1- ONXv2:00001'''
    278278  * ![DataSubmissionQuestionnaire : epi_pridiag.2nd_DHB_MT1]
    279279   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    282282   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    283283   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    284  * '''2nd_DHB_MT2- ONX-00001'''
     284 * '''2nd_DHB_MT2- ONXv2:00001'''
    285285  * ![DataSubmissionQuestionnaire : epi_pridiag.2nd_DHB_MT2]
    286286   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    289289   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    290290   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    291  * '''3rd_DHB- ONX-00001'''
     291 * '''3rd_DHB- ONXv2:00001'''
    292292  * ![DataSubmissionQuestionnaire : epi_pridiag.3rd_DHB]
    293293   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    296296   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    297297   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    298  * '''Acute_Heart_Failure- ONX-00001'''
     298 * '''Acute_Heart_Failure- ONXv2:00001'''
    299299  * ![DataSubmissionQuestionnaire : epi_pridiag.Acute_Heart_Failure]
    300300   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    303303   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    304304   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    305  * '''Chronic_Heart_Failure- ONX-00001'''
     305 * '''Chronic_Heart_Failure- ONXv2:00001'''
    306306  * ![DataSubmissionQuestionnaire : epi_pridiag.Chronic_Heart_Failure]
    307307   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    310310   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    311311   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    312  * '''Hyperlipidaemia- ONX-00001'''
     312 * '''Hyperlipidaemia- ONXv2:00001'''
    313313  * ![DataSubmissionQuestionnaire : epi_pridiag.Hyperlipidaemia]
    314314   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    317317   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    318318   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    319  * '''Essential_Hypertension- ONX-00001'''
     319 * '''Essential_Hypertension- ONXv2:00001'''
    320320  * ![DataSubmissionQuestionnaire : epi_pridiag.Essential_Hypertension]
    321321   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    324324   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    325325   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    326  * '''Secondary_Hypertension- ONX-00001'''
     326 * '''Secondary_Hypertension- ONXv2:00001'''
    327327  * ![DataSubmissionQuestionnaire : epi_pridiag.Secondary_Hypertension]
    328328   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    331331   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    332332   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    333  * '''Hypertrophic_Cardiomyopathy- ONX-00001'''
     333 * '''Hypertrophic_Cardiomyopathy- ONXv2:00001'''
    334334  * ![DataSubmissionQuestionnaire : epi_pridiag.Hypertrophic_Cardiomyopathy]
    335335   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    338338   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    339339   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    340  * '''Infective_Endocarditis- ONX-00001'''
     340 * '''Infective_Endocarditis- ONXv2:00001'''
    341341  * ![DataSubmissionQuestionnaire : epi_pridiag.Infective_Endocarditis]
    342342   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    345345   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    346346   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    347  * '''Intermittent_Claudication- ONX-00001'''
     347 * '''Intermittent_Claudication- ONXv2:00001'''
    348348  * ![DataSubmissionQuestionnaire : epi_pridiag.Intermittent_Claudication]
    349349   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    352352   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    353353   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    354  * '''Ischaemic_Cardiomyopathy- ONX-00001'''
     354 * '''Ischaemic_Cardiomyopathy- ONXv2:00001'''
    355355  * ![DataSubmissionQuestionnaire : epi_pridiag.Ischaemic_Cardiomyopathy]
    356356   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    359359   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    360360   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    361  * '''Late_Stent_Thrombosis- ONX-00001'''
     361 * '''Late_Stent_Thrombosis- ONXv2:00001'''
    362362  * ![DataSubmissionQuestionnaire : epi_pridiag.Late_Stent_Thrombosis]
    363363   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    366366   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    367367   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    368  * '''Mitral_Infective_Endocarditis- ONX-00001'''
     368 * '''Mitral_Infective_Endocarditis- ONXv2:00001'''
    369369  * ![DataSubmissionQuestionnaire : epi_pridiag.Mitral_Infective_Endocarditis]
    370370   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    373373   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    374374   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    375  * '''Mitral_Regurgitation- ONX-00001'''
     375 * '''Mitral_Regurgitation- ONXv2:00001'''
    376376  * ![DataSubmissionQuestionnaire : epi_pridiag.Mitral_Regurgitation]
    377377   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    380380   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    381381   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    382  * '''Mitral_Stenosis- ONX-00001'''
     382 * '''Mitral_Stenosis- ONXv2:00001'''
    383383  * ![DataSubmissionQuestionnaire : epi_pridiag.Mitral_Stenosis]
    384384   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    387387   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    388388   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    389  * '''Bacterial_Myocarditis- ONX-00001'''
     389 * '''Bacterial_Myocarditis- ONXv2:00001'''
    390390  * ![DataSubmissionQuestionnaire : epi_pridiag.Bacterial_Myocarditis]
    391391   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    394394   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    395395   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    396  * '''Viral_Myocarditis- ONX-00001'''
     396 * '''Viral_Myocarditis- ONXv2:00001'''
    397397  * ![DataSubmissionQuestionnaire : epi_pridiag.Viral_Myocarditis]
    398398   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    401401   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    402402   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    403  * '''Non_cardiac_Chest_Pain- ONX-00001'''
     403 * '''Non_cardiac_Chest_Pain- ONXv2:00001'''
    404404  * ![DataSubmissionQuestionnaire : epi_pridiag.Non_cardiac_Chest_Pain]
    405405   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    408408   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    409409   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    410  * '''Pericardial_Effusion- ONX-00001'''
     410 * '''Pericardial_Effusion- ONXv2:00001'''
    411411  * ![DataSubmissionQuestionnaire : epi_pridiag.Pericardial_Effusion]
    412412   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    415415   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    416416   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    417  * '''Bacterial_Pericarditis- ONX-00001'''
     417 * '''Bacterial_Pericarditis- ONXv2:00001'''
    418418  * ![DataSubmissionQuestionnaire : epi_pridiag.Bacterial_Pericarditis]
    419419   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    422422   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    423423   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    424  * '''Post_infarction_Pericarditis- ONX-00001'''
     424 * '''Post_infarction_Pericarditis- ONXv2:00001'''
    425425  * ![DataSubmissionQuestionnaire : epi_pridiag.Post_infarction_Pericarditis]
    426426   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    429429   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    430430   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    431  * '''Viral_Pericarditis- ONX-00001'''
     431 * '''Viral_Pericarditis- ONXv2:00001'''
    432432  * ![DataSubmissionQuestionnaire : epi_pridiag.Viral_Pericarditis]
    433433   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    436436   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    437437   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    438  * '''Other_Pericarditis- ONX-00001'''
     438 * '''Other_Pericarditis- ONXv2:00001'''
    439439  * ![DataSubmissionQuestionnaire : epi_pridiag.Other_Pericarditis]
    440440   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    443443   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    444444   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    445  * '''PE- ONX-00001'''
     445 * '''PE- ONXv2:00001'''
    446446  * ![DataSubmissionQuestionnaire : epi_pridiag.PE]
    447447   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    450450   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    451451   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    452  * '''Pulmonary_Infective_Endocarditis- ONX-00001'''
     452 * '''Pulmonary_Infective_Endocarditis- ONXv2:00001'''
    453453  * ![DataSubmissionQuestionnaire : epi_pridiag.Pulmonary_Infective_Endocarditis]
    454454   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    457457   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    458458   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    459  * '''Pulmonary_Regurgitation- ONX-00001'''
     459 * '''Pulmonary_Regurgitation- ONXv2:00001'''
    460460  * ![DataSubmissionQuestionnaire : epi_pridiag.Pulmonary_Regurgitation]
    461461   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    464464   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    465465   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    466  * '''Pulmonary_Stenosis- ONX-00001'''
     466 * '''Pulmonary_Stenosis- ONXv2:00001'''
    467467  * ![DataSubmissionQuestionnaire : epi_pridiag.Pulmonary_Stenosis]
    468468   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    471471   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    472472   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    473  * '''Restrictive_Cardiomyopathy- ONX-00001'''
     473 * '''Restrictive_Cardiomyopathy- ONXv2:00001'''
    474474  * ![DataSubmissionQuestionnaire : epi_pridiag.Restrictive_Cardiomyopathy]
    475475   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    478478   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    479479   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    480  * '''Ruptured_Aortic_Aneurysm- ONX-00001'''
     480 * '''Ruptured_Aortic_Aneurysm- ONXv2:00001'''
    481481  * ![DataSubmissionQuestionnaire : epi_pridiag.Ruptured_Aortic_Aneurysm]
    482482   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    485485   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    486486   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    487  * '''STEMI- ONX-00001'''
     487 * '''STEMI- ONXv2:00001'''
    488488  * ![DataSubmissionQuestionnaire : epi_pridiag.STEMI]
    489489   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    492492   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    493493   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    494  * '''Stable_Angina- ONX-00001'''
     494 * '''Stable_Angina- ONXv2:00001'''
    495495  * ![DataSubmissionQuestionnaire : epi_pridiag.Stable_Angina]
    496496   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    499499   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    500500   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    501  * '''Stable_CAD- ONX-00001'''
     501 * '''Stable_CAD- ONXv2:00001'''
    502502  * ![DataSubmissionQuestionnaire : epi_pridiag.Stable_CAD]
    503503   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    506506   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    507507   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    508  * '''SVT- ONX-00001'''
     508 * '''SVT- ONXv2:00001'''
    509509  * ![DataSubmissionQuestionnaire : epi_pridiag.SVT]
    510510   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    513513   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    514514   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    515  * '''Symptomatic_bradycardia- ONX-00001'''
     515 * '''Symptomatic_bradycardia- ONXv2:00001'''
    516516  * ![DataSubmissionQuestionnaire : epi_pridiag.Symptomatic_bradycardia]
    517517   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    520520   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    521521   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    522  * '''TIA- ONX-00001'''
     522 * '''TIA- ONXv2:00001'''
    523523  * ![DataSubmissionQuestionnaire : epi_pridiag.TIA]
    524524   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    527527   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    528528   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    529  * '''Tricuspid_Regurgitation- ONX-00001'''
     529 * '''Tricuspid_Regurgitation- ONXv2:00001'''
    530530  * ![DataSubmissionQuestionnaire : epi_pridiag.Tricuspid_Regurgitation]
    531531   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    534534   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    535535   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    536  * '''Tricuspid_Stenosis- ONX-00001'''
     536 * '''Tricuspid_Stenosis- ONXv2:00001'''
    537537  * ![DataSubmissionQuestionnaire : epi_pridiag.Tricuspid_Stenosis]
    538538   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    541541   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    542542   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    543  * '''Ventricular_Ectopics- ONX-00001'''
     543 * '''Ventricular_Ectopics- ONXv2:00001'''
    544544  * ![DataSubmissionQuestionnaire : epi_pridiag.Ventricular_Ectopics]
    545545   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    548548   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    549549   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    550  * '''VF- ONX-00001'''
     550 * '''VF- ONXv2:00001'''
    551551  * ![DataSubmissionQuestionnaire : epi_pridiag.VF]
    552552   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    555555   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    556556   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    557  * '''VT- ONX-00001'''
     557 * '''VT- ONXv2:00001'''
    558558  * ![DataSubmissionQuestionnaire : epi_pridiag.VT]
    559559   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    562562   * Modifier: 'Recruiting period of care presenting secondary diagnosis'
    563563   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    564  * '''WPW- ONX-00001'''
     564 * '''WPW- ONXv2:00001'''
    565565  * ![DataSubmissionQuestionnaire : epi_pridiag.WPW]
    566566   * Modifier: 'Recruiting period of care presenting primary diagnosis'
     
    570570   * Start Date: ![DataSubmissionQuestionnaire : epi_symponset]
    571571
    572  * '''Hypertension - ONX-00001'''
     572 * '''Hypertension - ONXv2:00001'''
    573573  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from high blood pressure]
    574574   * Modifier: 'Patient questionnaire'
     
    580580   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of onset of high blood pressure]  > ?
    581581   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    582  * '''Diabetes - ONX-00001'''
     582 * '''Diabetes - ONXv2:00001'''
    583583  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from diabetes]
    584584   * Modifier: 'Patient questionnaire'
     
    592592   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    593593   * Modifier: 'Type' - [MedicalHistoryQuestionnaire: Which type of diabetes]
    594  * '''High Cholesterol - ONX-00001'''
     594 * '''High Cholesterol - ONXv2:00001'''
    595595  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from high cholesterol]
    596596   * Modifier: 'Patient questionnaire'
     
    602602   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of onset of high cholesterol]  > ?
    603603   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    604  * '''Myocardial Infarction - ONX-00001'''
     604 * '''Myocardial Infarction - ONXv2:00001'''
    605605  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered a heart attack or myocardial infarction (M.I.)]
    606606   * One record for each ![MedicalHistoryInterviewQuestionnaire : How many heart attacks or MIs have you had]
     
    613613   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of occurrence of each MI]  > ?
    614614   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    615  * '''Cerebrovascular Accident (CVA) - ONX-00001'''
     615 * '''Cerebrovascular Accident (CVA) - ONXv2:00001'''
    616616  * ![MedicalHistoryInterviewQuestionnaire : Have you ever had a stroke or a cerebrovascular accident (CVA)]
    617617   * One record for each ![MedicalHistoryInterviewQuestionnaire : How many CVAs]
     
    624624   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of occurrence of each CVA: (one per occurrence)]  > ?
    625625   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    626  * '''Transient Ischaemic Attack (TIA) - ONX-00001'''
     626 * '''Transient Ischaemic Attack (TIA) - ONXv2:00001'''
    627627  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from transient ischaemic attack (TIA)]
    628628   * One record for each ![MedicalHistoryInterviewQuestionnaire : How many TIAs have you suffered]
     
    635635   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of occurrence of each TIA: (one per occurrence)]  > ?
    636636   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    637  * '''Angina - ONX-00001'''
     637 * '''Angina - ONXv2:00001'''
    638638  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from angina]
    639639   * Modifier: 'Patient questionnaire'
     
    645645   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of onset of angina]  > ?
    646646   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    647  * '''Peripheral Vascular Disease (PVD) - ONX-00001'''
     647 * '''Peripheral Vascular Disease (PVD) - ONXv2:00001'''
    648648  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from peripheral vascular disease (PVD)]
    649649   * Modifier: 'Patient questionnaire'
     
    655655   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of onset of peripheral vascular disease (PVD)]  > ?
    656656   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    657  * '''Valvular Heart Disease - ONX-00001'''
     657 * '''Valvular Heart Disease - ONXv2:00001'''
    658658  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from valvular heart disease]
    659659   * Modifier: 'Patient questionnaire'
     
    667667   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    668668   * Modifier: 'Type' - ![MedicalHistoryQuestionnaire: Which type of Valvular Heart Disease]
    669  * '''Aortic Aneurysm - ONX-00001'''
     669 * '''Aortic Aneurysm - ONXv2:00001'''
    670670  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from an aortic aneurysm]
    671671   * Modifier: 'Patient questionnaire'
     
    677677   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of onset of aortic aneurysm]  > ?
    678678   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    679  * '''Chronic Renal Failure - ONX-00001'''
     679 * '''Chronic Renal Failure - ONXv2:00001'''
    680680  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from chronic renal failure]
    681681   * Modifier: 'Patient questionnaire'
     
    687687   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of onset of chronic renal failure]  > ?
    688688   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    689  * '''Chronic Obstructive airway disease (COAD) or chronic obstructive pulmonary disease (COPD) - ONX-00001'''
     689 * '''Chronic Obstructive airway disease (COAD) or chronic obstructive pulmonary disease (COPD) - ONXv2:00001'''
    690690  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from chronic obstructive airway disease (COAD) or chronic obstructive pulmonary disease (COPD)]
    691691   * Modifier: 'Patient questionnaire'
     
    697697   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of onset of chronic obstructive airway disease (COAD) or chronic obstructive pulmonary disease (COPD)]  > ?
    698698   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    699  * '''liver disease - ONX-00001'''
     699 * '''liver disease - ONXv2:00001'''
    700700  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from liver disease]
    701701   * Modifier: 'Patient questionnaire'
     
    707707   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of onset of liver disease]  > ?
    708708   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    709  * '''asthma - ONX-00001'''
     709 * '''asthma - ONXv2:00001'''
    710710  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from asthma]
    711711   * Modifier: 'Patient questionnaire'
     
    717717   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of onset of asthma]  > ?
    718718   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    719  * '''Atrial Fibrillation (AF) - ONX-00001'''
     719 * '''Atrial Fibrillation (AF) - ONXv2:00001'''
    720720  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from Atrial Fibrillation (AF)]
    721721   * Modifier: 'Patient questionnaire'
     
    727727   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of onset of AF]  > ?
    728728   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    729  * '''heart rhythm disturbance - ONX-00001'''
     729 * '''heart rhythm disturbance - ONXv2:00001'''
    730730  * ![MedicalHistoryInterviewQuestionnaire : Have you ever suffered from any other heart rhythm disturbance]
    731731   * Modifier: 'Patient questionnaire'
     
    737737   * Start Date for 'Y' : ![MedicalHistoryQuestionnaire: Year of onset of heart rhythm disturbance]  > ?
    738738   * Start Date for for other answers : ![MedicalHistoryQuestionnaire: QuestionnaireRun.timeStart]  > ?
    739  * '''Details of other diagnoses - ONX-00001''' (''Potential future target for NLP'')
     739 * '''Details of other diagnoses - ONXv2:00001''' (''Potential future target for NLP'')
    740740  * ![DataSubmissionQuestionnaire : Please supply details of the other secondary diagnosis]
    741741   * Modifier: 'Recruiting period of care presenting other secondary diagnosis'
    742742   * Start Date: ![DataSubmissionQuestionnaire : When was the First Onset of Symptoms]  > ?
    743 * '''Prescribing - ONX-00001''' (Leaf per drug)
     743* '''Prescribing - ONXv2:00001''' (Leaf per drug)
    744744  * ![ConclusionQuestionnaire : Drugs on Discharge]
    745745   * Start Date: ![DataSubmissionQuestionnaire : When was the First Onset of Symptoms]  > ?
    746746   * Modifier: 'Recruiting period of care discharge'
    747 * '''Procedures - ONX-00001'''
    748  * '''CABG Coronary Artery Bypass Graft - ONX-00001''' (Start Date)
     747* '''Procedures - ONXv2:00001'''
     748 * '''CABG Coronary Artery Bypass Graft - ONXv2:00001''' (Start Date)
    749749  * ![DataSubmissionQuestionnaire : CABG Coronary Artery Bypass Graft]
    750750   * Modifier: 'Notes from period of care'?
     
    753753  * ![MedicalHistoryQuestionnaire: Enter the year for each CABG] - one for each occurrence
    754754   * Modifier: 'Historic Medical Notes'
    755  * '''Valve Surgery - ONX-00001''' (Start Date)
     755 * '''Valve Surgery - ONXv2:00001''' (Start Date)
    756756  * ![DataSubmissionQuestionnaire : Valve Surgery]
    757757   * Modifier: 'Notes from period of care'?
     
    760760  * ![MedicalHistoryQuestionnaire: Enter the year for each Valve_Surgery] - one for each occurrence
    761761   * Modifier: 'Historic Medical Notes'
    762  * '''TAVI - Transcatheter Aortic Valve Implantation - ONX-00001''' (Start Date)
     762 * '''TAVI - Transcatheter Aortic Valve Implantation - ONXv2:00001''' (Start Date)
    763763  * ![DataSubmissionQuestionnaire : TAVI - Transcatheter Aortic Valve Implantation]
    764764   * Modifier: 'Notes from period of care'?
     
    767767  * ![MedicalHistoryQuestionnaire: Enter the year TAVI was performed]
    768768   * Modifier: 'Historic Medical Notes'
    769  * '''PPCI - Primary Percutaneous Coronary Intervention - ONX-00001''' (Start Date)
     769 * '''PPCI - Primary Percutaneous Coronary Intervention - ONXv2:00001''' (Start Date)
    770770  * ![DataSubmissionQuestionnaire : PPCI - Primary Percutaneous Coronary Intervention]
    771771   * Modifier: 'Notes from period of care'?
     
    774774  * ![MedicalHistoryQuestionnaire: Enter the year for each Primary PCI] - one for each occurrence
    775775   * Modifier: 'Historic Medical Notes'
    776  * '''Other PCI - ONX-00001''' (Start Date)
     776 * '''Other PCI - ONXv2:00001''' (Start Date)
    777777  * ![DataSubmissionQuestionnaire : Other PCI]
    778778   * Modifier: 'Notes from period of care'?
     
    781781  * ![MedicalHistoryQuestionnaire: Enter the year of each other PCI] - one for each occurrence
    782782   * Modifier: 'Historic Medical Notes'
    783  * '''Pacemaker insertion - ONX-00001''' (Start Date)
     783 * '''Pacemaker insertion - ONXv2:00001''' (Start Date)
    784784  * ![DataSubmissionQuestionnaire : Pacemaker insertion]
    785785   * Modifier: 'Notes from period of care'?
     
    788788  * ![MedicalHistoryQuestionnaire: Enter the year for each pacemaker] - one for each occurrence
    789789   * Modifier: 'Historic Medical Notes'
    790  * '''ICD - Implantable Cardioverter Defibrillator - ONX-00001''' (Start Date)
     790 * '''ICD - Implantable Cardioverter Defibrillator - ONXv2:00001''' (Start Date)
    791791  * ![DataSubmissionQuestionnaire : ICD - Implantable Cardioverter Defibrillator]
    792792   * Modifier: 'Notes from period of care'?
     
    795795  * ![MedicalHistoryQuestionnaire: Enter the year for each ICD] - one for each occurrence
    796796   * Modifier: 'Historic Medical Notes'
    797  * '''DC Cardioversion - ONX-00001''' (Start Date)
     797 * '''DC Cardioversion - ONXv2:00001''' (Start Date)
    798798  * ![DataSubmissionQuestionnaire : DC Cardioversion]
    799799   * Modifier: 'Notes from period of care'?
     
    802802  * ![MedicalHistoryQuestionnaire: Enter the year for each DC cardioversion] - one for each occurrence
    803803   * Modifier: 'Historic Medical Notes'
    804  * '''LVAD - Left Ventricular Assist Device - ONX-00001''' (Start Date)
     804 * '''LVAD - Left Ventricular Assist Device - ONXv2:00001''' (Start Date)
    805805  * ![DataSubmissionQuestionnaire : LVAD - Left Ventricular Assist Device]
    806806   * Modifier: 'Notes from period of care'?
     
    809809  * ![MedicalHistoryQuestionnaire: Enter the year for each LVAD] - one for each occurrence
    810810   * Modifier: 'Historic Medical Notes'
    811  * '''Thrombolysis - ONX-00001''' (Start Date)
     811 * '''Thrombolysis - ONXv2:00001''' (Start Date)
    812812  * ![DataSubmissionQuestionnaire : Thrombolysis]
    813813   * Modifier: 'Notes from period of care'?
     
    816816  * ![MedicalHistoryQuestionnaire: Enter the year for each thrombolysis treatment] - one for each occurrence
    817817   * Modifier: 'Historic Medical Notes'
    818  * '''Electrophysiology (EP) / Radiofrequency (RF) Ablation - ONX-00001'''(Start Date)
     818 * '''Electrophysiology (EP) / Radiofrequency (RF) Ablation - ONXv2:00001'''(Start Date)
    819819  * ![DataSubmissionQuestionnaire : Electrophysiology (EP) / Radiofrequency (RF) Ablation]
    820820   * Modifier: 'Notes from period of care'?
    821  * '''Coronary Angiography - ONX-00001''' (Start Date)
     821 * '''Coronary Angiography - ONXv2:00001''' (Start Date)
    822822  * ![DataSubmissionQuestionnaire : Coronary Angiography]
    823823   * Modifier: 'Notes from period of care'?
    824  * '''ablation - ONX-00001''' (Start Date)
     824 * '''ablation - ONXv2:00001''' (Start Date)
    825825  * ![MedicalHistoryInterviewQuestionnaire: Enter the year for each ablation] - one for each occurrence
    826826   * Modifier: 'Patient questionnaire'
    827827  * ![MedicalHistoryQuestionnaire: Enter the year for each ablation] - one for each occurrence
    828828   * Modifier: 'Historic Medical Notes'
    829  * '''Aortic Balloon Pump - ONX-00001''' (Start Date)
     829 * '''Aortic Balloon Pump - ONXv2:00001''' (Start Date)
    830830  * ![MedicalHistoryInterviewQuestionnaire: Enter the year for each Aortic Balloon Pump] - one for each occurrence
    831831   * Modifier: 'Patient questionnaire'
    832832  * ![MedicalHistoryQuestionnaire: Enter the year for each Aortic Balloon Pump] - one for each occurrence
    833833   * Modifier: 'Historic Medical Notes'
    834  * '''bare metal stent - ONX-00001''' (Start Date)
     834 * '''bare metal stent - ONXv2:00001''' (Start Date)
    835835  * ![MedicalHistoryInterviewQuestionnaire: Enter the year for each bare metal stent] - one for each occurrence
    836836   * Modifier: 'Patient questionnaire'
    837837  * ![MedicalHistoryQuestionnaire: Enter the year for each bare metal stent] - one for each occurrence
    838838   * Modifier: 'Historic Medical Notes'
    839  * '''drug-eluting stent - ONX-00001''' (Start Date)
     839 * '''drug-eluting stent - ONXv2:00001''' (Start Date)
    840840  * ![MedicalHistoryInterviewQuestionnaire: Enter the year for each drug-eluting stent fitted] - one for each occurrence
    841841   * Modifier: 'Patient questionnaire'
    842842  * ![MedicalHistoryQuestionnaire: Enter the year for each drug-eluting stent] - one for each occurrence
    843843   * Modifier: 'Historic Medical Notes'
    844  * '''CPAP - ONX-00001''' (Start Date)
     844 * '''CPAP - ONXv2:00001''' (Start Date)
    845845  * ![MedicalHistoryInterviewQuestionnaire: Enter the year for each CPAP] - one for each occurrence
    846846   * Modifier: 'Patient questionnaire'
    847847  * ![MedicalHistoryQuestionnaire: Enter the year for each CPAP] - one for each occurrence
    848848   * Modifier: 'Historic Medical Notes'
    849  * '''heart transplant - ONX-00001''' (Start Date)
     849 * '''heart transplant - ONXv2:00001''' (Start Date)
    850850  * ![MedicalHistoryInterviewQuestionnaire: Enter the year for each heart transplant] - one for each occurrence
    851851   * Modifier: 'Patient questionnaire'
    852852  * ![MedicalHistoryQuestionnaire: Enter the year for each heart transplant] - one for each occurrence
    853853   * Modifier: 'Historic Medical Notes'
    854 * '''Observations - ONX-00001'''
    855  * '''Heart Rate - ONX-00001''' (Numeric)
     854* '''Observations - ONXv2:00001'''
     855 * '''Heart Rate - ONXv2:00001''' (Numeric)
    856856  * ![DataSubmissionQuestionnaire : First recorded Heart Rate during this episode of care]
    857857   * Start Date: ?
     
    860860   * Start Date: ?
    861861   * Modifier: 'Notes from period of care'?
    862  * '''Systolic Blood Pressure - ONX-00001''' (Numeric)
     862 * '''Systolic Blood Pressure - ONXv2:00001''' (Numeric)
    863863  * ![DataSubmissionQuestionnaire : First recorded Systolic Blood Pressure]
    864864   * Start Date: ?
     
    867867   * Start Date: ?
    868868   * Modifier: 'Notes from period of care'?
    869  * '''Diastolic Blood Pressure - ONX-00001''' (Numeric)
     869 * '''Diastolic Blood Pressure - ONXv2:00001''' (Numeric)
    870870  * ![DataSubmissionQuestionnaire : First recorded Diastolic Blood Pressure]
    871871   * Start Date: ?
     
    874874   * Start Date: ?
    875875   * Modifier: 'Notes from period of care'?
    876  * '''Height - ONX-00001''' (Numeric)
     876 * '''Height - ONXv2:00001''' (Numeric)
    877877  * ![DataSubmissionQuestionnaire : Height]
    878878   * Start Date: ?
    879879   * Modifier: 'Notes from period of care'?
    880  * '''Weight - ONX-00001''' (Numeric)
     880 * '''Weight - ONXv2:00001''' (Numeric)
    881881  * ![DataSubmissionQuestionnaire : Weight]
    882882   * Start Date: ?
    883883   * Modifier: 'Notes from period of care'?
    884  * '''Measurement around the waist - ONX-00001''' (Numeric)
     884 * '''Measurement around the waist - ONXv2:00001''' (Numeric)
    885885  * ![EndContactQuestionnaire: Measurement around the waist]
    886886   * Start Date: ![EndContactQuestionnaire: QuestionnaireRun.timeStart]
    887887   * Modifier: 'Interview'?
    888  * '''Measurement around the hips - ONX-00001''' (Numeric)
     888 * '''Measurement around the hips - ONXv2:00001''' (Numeric)
    889889  * ![EndContactQuestionnaire: Measurement around the hips]
    890890   * Start Date: ![EndContactQuestionnaire: QuestionnaireRun.timeStart]
    891891   * Modifier: 'Interview'?
    892  * '''Skin-fold measurement - biceps - ONX-00001''' (Numeric)
     892 * '''Skin-fold measurement - biceps - ONXv2:00001''' (Numeric)
    893893  * ![EndContactQuestionnaire: Skin-fold measurement - biceps]
    894894   * Start Date: ![EndContactQuestionnaire: QuestionnaireRun.timeStart]
    895895   * Modifier: 'Interview'?
    896  * '''Skin-fold measurement - triceps - ONX-00001''' (Numeric)
     896 * '''Skin-fold measurement - triceps - ONXv2:00001''' (Numeric)
    897897  * ![EndContactQuestionnaire: Skin-fold measurement - triceps]
    898898   * Start Date: ![EndContactQuestionnaire: QuestionnaireRun.timeStart]
    899899   * Modifier: 'Interview'?
    900  * '''Skin-fold measurement - subscapular - ONX-00001''' (Numeric)
     900 * '''Skin-fold measurement - subscapular - ONXv2:00001''' (Numeric)
    901901  * ![EndContactQuestionnaire: Skin-fold measurement - subscapular]
    902902   * Start Date: ![EndContactQuestionnaire: QuestionnaireRun.timeStart]
    903903   * Modifier: 'Interview'?
    904  * '''Skin-fold measurement - supra-iliac - ONX-00001''' (Numeric)
     904 * '''Skin-fold measurement - supra-iliac - ONXv2:00001''' (Numeric)
    905905  * ![EndContactQuestionnaire: Skin-fold measurement - supra-iliac]
    906906   * Start Date: ![EndContactQuestionnaire: QuestionnaireRun.timeStart]
    907907   * Modifier: 'Interview'?
    908  * '''Skin-fold measurement - supra-iliac - ONX-00001''' (Numeric)
     908 * '''Skin-fold measurement - supra-iliac - ONXv2:00001''' (Numeric)
    909909  * ![EndContactQuestionnaire: Skin-fold measurement - supra-iliac]
    910910   * Start Date: ![EndContactQuestionnaire: QuestionnaireRun.timeStart]
    911911   * Modifier: 'Interview'?
    912 * '''Risk Factors - ONX-00001'''
    913  * '''Tobacco - ONX-00001'''
    914   * '''Has smoked or used any tobacco or nicotine product - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     912* '''Risk Factors - ONXv2:00001'''
     913 * '''Tobacco - ONXv2:00001'''
     914  * '''Has smoked or used any tobacco or nicotine product - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    915915   * ![RiskFactorQuestionnaire: Have you ever smoked or used any tobacco or nicotine product]
    916916    * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    917    * '''Cigarettes - ONX-00001'''
    918     * '''Has smoked at some time - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     917   * '''Cigarettes - ONXv2:00001'''
     918    * '''Has smoked at some time - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    919919     * ![RiskFactorQuestionnaire: Which of the following have you ever smoked or used]
    920920     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    921     * '''Has smoked cigarettes on most days - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     921    * '''Has smoked cigarettes on most days - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    922922     * ![RiskFactorQuestionnaire: Have you ever smoked cigarettes on most days]
    923923     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    924     * '''Currently smoke cigarettes - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     924    * '''Currently smoke cigarettes - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    925925     * ![RiskFactorQuestionnaire: Do you currently smoke cigarettes]
    926926     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    927     * '''Maximum cigarettes per day - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     927    * '''Maximum cigarettes per day - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    928928     * ![RiskFactorQuestionnaire: On average, how many cigarettes did you smoke per day when you were smoking the most]
    929929     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    930     * '''Age of regular smoking onset - ONX-00001''' (Numeric)
     930    * '''Age of regular smoking onset - ONXv2:00001''' (Numeric)
    931931     * ![RiskFactorQuestionnaire: How old were you when you began smoking cigarettes on most days]
    932932     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    933     * '''Age of smoking cessation - ONX-00001''' (Numeric)
     933    * '''Age of smoking cessation - ONXv2:00001''' (Numeric)
    934934     * ![RiskFactorQuestionnaire: How old were you when you stopped smoking cigarettes]
    935935     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    936     * '''cigarettes currently smoked per day - ONX-00001''' (Numeric)
     936    * '''cigarettes currently smoked per day - ONXv2:00001''' (Numeric)
    937937     * ![RiskFactorQuestionnaire: On average, how many cigarettes do you currently smoke per day]
    938938     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    939     * '''Time since last cigarette - ONX-00001''' (Recent time)
     939    * '''Time since last cigarette - ONXv2:00001''' (Recent time)
    940940     * ![RiskFactorQuestionnaire: When was the last time you had a cigarette]
    941941     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    942    * '''Cigars - ONX-00001'''
    943     * '''Has smoked at some time - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     942   * '''Cigars - ONXv2:00001'''
     943    * '''Has smoked at some time - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    944944     * ![RiskFactorQuestionnaire: Which of the following have you ever smoked or used]
    945945     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    946     * '''Has smoked cigars on most days - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     946    * '''Has smoked cigars on most days - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    947947     * ![RiskFactorQuestionnaire: Have you ever smoked cigars regularly]
    948948     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    949     * '''Currently smokes cigars - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     949    * '''Currently smokes cigars - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    950950     * ![RiskFactorQuestionnaire: Do you currently smoke cigars]
    951951     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    952     * '''Maximum cigars per day - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     952    * '''Maximum cigars per day - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    953953     * ![RiskFactorQuestionnaire: On average, how many cigars did you smoke per day when you were smoking the most]
    954954     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    955     * '''Age of regular smoking of cigars onset - ONX-00001''' (Numeric)
     955    * '''Age of regular smoking of cigars onset - ONXv2:00001''' (Numeric)
    956956     * ![RiskFactorQuestionnaire: How old were you when you began smoking cigars on most days]
    957957     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    958     * '''Age of smoking cigars cessation - ONX-00001''' (Numeric)
     958    * '''Age of smoking cigars cessation - ONXv2:00001''' (Numeric)
    959959     * ![RiskFactorQuestionnaire: How old were you when you stopped smoking cigars]
    960960     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    961     * '''cigars currently smoked per day - ONX-00001''' (Numeric)
     961    * '''cigars currently smoked per day - ONXv2:00001''' (Numeric)
    962962     * ![RiskFactorQuestionnaire: On average, how many cigars do you currently smoke per day]
    963963     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    964     * '''Time since last cigar - ONX-00001''' (Recent time)
     964    * '''Time since last cigar - ONXv2:00001''' (Recent time)
    965965     * ![RiskFactorQuestionnaire: When was the last time you had a cigar]
    966966     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    967967
    968    * '''Pipe - ONX-00001'''
    969     * '''Has smoked at some time - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     968   * '''Pipe - ONXv2:00001'''
     969    * '''Has smoked at some time - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    970970     * ![RiskFactorQuestionnaire: Which of the following have you ever smoked or used]
    971971     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    972     * '''Has smoked a pipe on most days - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     972    * '''Has smoked a pipe on most days - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    973973     * ![RiskFactorQuestionnaire: Have you ever smoked a pipe regularly]
    974974     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    975     * '''Currently smokes a pipe - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     975    * '''Currently smokes a pipe - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    976976     * ![RiskFactorQuestionnaire: Do you currently smoke a pipe]
    977977     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    978     * '''Maximum pipe tobacco per day - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     978    * '''Maximum pipe tobacco per day - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    979979     * ![RiskFactorQuestionnaire: How much tobacco did you smoke per day when you were smoking the most]
    980980     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    981     * '''Age of regular pipe smoking onset - ONX-00001''' (Numeric)
     981    * '''Age of regular pipe smoking onset - ONXv2:00001''' (Numeric)
    982982     * ![RiskFactorQuestionnaire: How old were you when you began smoking a pipe on most days]
    983983     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    984     * '''Age of smoking a pipe cessation - ONX-00001''' (Numeric)
     984    * '''Age of smoking a pipe cessation - ONXv2:00001''' (Numeric)
    985985     * ![RiskFactorQuestionnaire: How old were you when you stopped smoking a pipe]
    986986     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    987     * '''Pipe tobacco currently smoked per day - ONX-00001''' (Numeric)
     987    * '''Pipe tobacco currently smoked per day - ONXv2:00001''' (Numeric)
    988988     * ![RiskFactorQuestionnaire: How much tobacco do you currently smoke per day]
    989989     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    990     * '''Time since last pipe - ONX-00001'''(Recent time)
     990    * '''Time since last pipe - ONXv2:00001'''(Recent time)
    991991     * ![RiskFactorQuestionnaire: When was the last time you smoked a pipe]
    992992     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    993993
    994    * '''Snuff or Chewing Tobabcco - ONX-00001'''
    995     * '''Has used at some time - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     994   * '''Snuff or Chewing Tobabcco - ONXv2:00001'''
     995    * '''Has used at some time - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    996996     * ![RiskFactorQuestionnaire: Which of the following have you ever smoked or used]
    997997     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    998     * '''Has used snuff or chewing tobacco on most days - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     998    * '''Has used snuff or chewing tobacco on most days - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    999999     * ![RiskFactorQuestionnaire: Have you ever used snuff or chewing tobacco regularly]
    10001000     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1001     * '''Currently uses snuff or chewing tobacco - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     1001    * '''Currently uses snuff or chewing tobacco - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    10021002     * ![RiskFactorQuestionnaire: Do you currently use snuff or chewing tobacco]
    10031003     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1004     * '''Maximum snuff or chewing tobacco usage - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     1004    * '''Maximum snuff or chewing tobacco usage - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    10051005     * ![RiskFactorQuestionnaire: How much snuff or chewing tobacco did you smoke per day when you were using the most]
    10061006     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1007     * '''Age of snuff or chewing tobacco usage onset - ONX-00001''' (Numeric)
     1007    * '''Age of snuff or chewing tobacco usage onset - ONXv2:00001''' (Numeric)
    10081008     * ![RiskFactorQuestionnaire: How old were you when you began using snuff or chewing tobacco]
    10091009     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1010     * '''Age of snuff or chewing tobacco usage cessation - ONX-00001''' (Numeric)
     1010    * '''Age of snuff or chewing tobacco usage cessation - ONXv2:00001''' (Numeric)
    10111011     * ![RiskFactorQuestionnaire: How old were you when you stopped using snuff or chewing tobacco]
    10121012     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1013     * '''snuff or chewing tobacco currently used per day - ONX-00001''' (Numeric)
     1013    * '''snuff or chewing tobacco currently used per day - ONXv2:00001''' (Numeric)
    10141014     * ![RiskFactorQuestionnaire: How much snuff or chewing tobacco do you use per week]
    10151015     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1016     * '''Time since last pipe - ONX-00001''' (Recent time)
     1016    * '''Time since last pipe - ONXv2:00001''' (Recent time)
    10171017     * ![RiskFactorQuestionnaire: When was the last time you has snuff or chewing tobacco]
    10181018     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    10191019   
    1020    * '''Other tobacco or Nicotine Product - ONX-00001'''
    1021     * '''Has used at some time - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     1020   * '''Other tobacco or Nicotine Product - ONXv2:00001'''
     1021    * '''Has used at some time - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    10221022     * ![RiskFactorQuestionnaire: Which of the following have you ever smoked or used]
    10231023     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1024     * '''Has used other tobacco or nicotine product for at least 6 months - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     1024    * '''Has used other tobacco or nicotine product for at least 6 months - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    10251025     * ![RiskFactorQuestionnaire: Have you ever used any other tobacco or nicotine product for at least 6 months]
    10261026     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1027     * '''Currently uses other tobacco or nicotine product - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     1027    * '''Currently uses other tobacco or nicotine product - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    10281028     * ![RiskFactorQuestionnaire: Do you currently use any other tobacco or nicotine product]
    10291029     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1030     * '''Maximum tobacco or nicotine product usage per week - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     1030    * '''Maximum tobacco or nicotine product usage per week - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    10311031     * ![RiskFactorQuestionnaire: How much of the tobacco or nicotine product per week did you use when you were using the most]
    10321032     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1033     * '''Age of tobacco or nicotine product usage onset - ONX-00001''' (Numeric)
     1033    * '''Age of tobacco or nicotine product usage onset - ONXv2:00001''' (Numeric)
    10341034     * ![RiskFactorQuestionnaire: How old were you when you began using the tobacco or nicotine product]
    10351035     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1036     * '''Age of tobacco or nicotine product usage cessation - ONX-00001''' (Numeric)
     1036    * '''Age of tobacco or nicotine product usage cessation - ONXv2:00001''' (Numeric)
    10371037     * ![RiskFactorQuestionnaire: How old were you when you stopped using the tobacco or nicotine product]
    10381038     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1039     * '''Current tobacco or nicotine product usage per week - ONX-00001''' (Numeric)
     1039    * '''Current tobacco or nicotine product usage per week - ONXv2:00001''' (Numeric)
    10401040     * ![RiskFactorQuestionnaire: How much of the tobacco or nicotine product do you use per week]
    10411041     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1042     * '''Time since last tobacco or nicotine usage - ONX-00001''' (Recent time)
     1042    * '''Time since last tobacco or nicotine usage - ONXv2:00001''' (Recent time)
    10431043     * ![RiskFactorQuestionnaire: When was the last time you had any tobacco or nicotine]
    10441044     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    10451045   
    1046    * '''Alcohol - ONX-00001'''
    1047     * '''Has drunk alcohol - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     1046   * '''Alcohol - ONXv2:00001'''
     1047    * '''Has drunk alcohol - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    10481048     * ![RiskFactorQuestionnaire: Have you ever drunk alcohol]
    10491049     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1050     * '''Has drunk alcohol at least once per week - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     1050    * '''Has drunk alcohol at least once per week - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    10511051     * ![RiskFactorQuestionnaire: Have you ever drunk alcohol at least once per week]
    10521052     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1053     * '''Currently drinks alcohol at least once per week - ONX-00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
     1053    * '''Currently drinks alcohol at least once per week - ONXv2:00001''' ('Y', 'N', 'Prefer not to answer' & 'Don't know')
    10541054     * ![RiskFactorQuestionnaire: Do you currently drink alcohol at least once per week]
    10551055     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1056     * '''Current pints of beer drunk in a typical week - ONX-00001''' (Numeric)
     1056    * '''Current pints of beer drunk in a typical week - ONXv2:00001''' (Numeric)
    10571057     * ![RiskFactorQuestionnaire: How many pints of beer do you drink in a typical week]
    10581058     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1059     * '''Current glasses of white wine drunk in a typical week - ONX-00001''' (Numeric)
     1059    * '''Current glasses of white wine drunk in a typical week - ONXv2:00001''' (Numeric)
    10601060     * ![RiskFactorQuestionnaire: How many glasses of white wine do you drink in a typical week]
    10611061     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1062     * '''Current glasses of red wine in a typical week - ONX-00001''' (Numeric)
     1062    * '''Current glasses of red wine in a typical week - ONXv2:00001''' (Numeric)
    10631063     * ![RiskFactorQuestionnaire: How many glasses of red wine do you drink in a typical week]
    10641064     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1065     * '''Current glasses of rose wine in a typical week - ONX-00001''' (Numeric)
     1065    * '''Current glasses of rose wine in a typical week - ONXv2:00001''' (Numeric)
    10661066     * ![RiskFactorQuestionnaire: How many glasses of rose wine do you drink in a typical week]
    10671067     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1068     * '''Current measures of spirits in a typical week - ONX-00001''' (Numeric)
     1068    * '''Current measures of spirits in a typical week - ONXv2:00001''' (Numeric)
    10691069     * ![RiskFactorQuestionnaire: How many measures of spirits do you drink in a typical week]
    10701070     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1071     * '''Age of Alcohol usage onset - ONX-00001''' (Numeric)
     1071    * '''Age of Alcohol usage onset - ONXv2:00001''' (Numeric)
    10721072     * ![RiskFactorQuestionnaire: How old were you when you began drinking alcohol]
    10731073     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1074     * '''Time since last alcohol usage - ONX-00001''' (Recent time)
     1074    * '''Time since last alcohol usage - ONXv2:00001''' (Recent time)
    10751075     * ![RiskFactorQuestionnaire: When was the last time you had a drink containing alcohol]
    10761076     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    10771077
    1078    * '''Diet - ONX-00001'''
    1079     * '''Type of diet - ONX-00001''' (Enumerated list)
     1078   * '''Diet - ONXv2:00001'''
     1079    * '''Type of diet - ONXv2:00001''' (Enumerated list)
    10801080     * ![RiskFactorQuestionnaire: How would you describe your diet]
    10811081     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    10821082
    1083    * '''Activity - ONX-00001'''
    1084     * '''Work involves physical activity - ONX-00001''' (yes/no)
     1083   * '''Activity - ONXv2:00001'''
     1084    * '''Work involves physical activity - ONXv2:00001''' (yes/no)
    10851085     * ![RiskFactorQuestionnaire: If you work, does your work involve any physical activity]
    10861086     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1087     * '''Undertakes regular exercise - ONX-00001''' (yes/no)
     1087    * '''Undertakes regular exercise - ONXv2:00001''' (yes/no)
    10881088     * ![RiskFactorQuestionnaire: Apart from work, do you undertake any regular physical exercise over and above that of daily living]
    10891089     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    10901090
    1091    * '''Familiy History - ONX-00001'''
    1092     * '''Number of brothers - ONX-00001''' (Numeric)
     1091   * '''Familiy History - ONXv2:00001'''
     1092    * '''Number of brothers - ONXv2:00001''' (Numeric)
    10931093     * ![RiskFactorQuestionnaire: How many brothers do you have]
    10941094     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1095     * '''Number of sisters - ONX-00001''' (Numeric)
     1095    * '''Number of sisters - ONXv2:00001''' (Numeric)
    10961096     * ![RiskFactorQuestionnaire: How many sisters do you have]
    10971097     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1098     * '''Number of children - ONX-00001''' (Numeric)
     1098    * '''Number of children - ONXv2:00001''' (Numeric)
    10991099     * ![RiskFactorQuestionnaire: How many children do you have]
    11001100     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1101     * '''Relatives suffered angina or other Coronary Artery Disease - ONX-00001''' (y, n, pnta, dk)
     1101    * '''Relatives suffered angina or other Coronary Artery Disease - ONXv2:00001''' (y, n, pnta, dk)
    11021102     * ![RiskFactorQuestionnaire: Have any of your relatives suffered angina or other Coronary Artery Disease]
    11031103      * Modifier: Father, Mother, Brother, Sister, Child
    11041104     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1105     * '''Relatives suffered a heart attack or Myocardial Infarction - ONX-00001''' (y, n, pnta, dk)
     1105    * '''Relatives suffered a heart attack or Myocardial Infarction - ONXv2:00001''' (y, n, pnta, dk)
    11061106     * ![RiskFactorQuestionnaire: Have any of your relatives suffered a heart attack or Myocardial Infarction]
    11071107      * Modifier: Father, Mother, Brother, Sister, Child
    11081108     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1109     * '''Relatives been diagnosed with heart failure - ONX-00001''' (y, n, pnta, dk)
     1109    * '''Relatives been diagnosed with heart failure - ONXv2:00001''' (y, n, pnta, dk)
    11101110     * ![RiskFactorQuestionnaire: Have any of your relatives ever been diagnosed with heart failure]
    11111111      * Modifier: Father, Mother, Brother, Sister, Child
    11121112     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1113     * '''Relatives suffered Atrial Fibrillation (AF) - ONX-00001''' (y, n, pnta, dk)
     1113    * '''Relatives suffered Atrial Fibrillation (AF) - ONXv2:00001''' (y, n, pnta, dk)
    11141114     * ![RiskFactorQuestionnaire: Have any of your relatives ever suffered Atrial Fibrillation (AF)]
    11151115      * Modifier: Father, Mother, Brother, Sister, Child
    11161116     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1117     * '''Relatives suffered a stroke or CVA - ONX-00001''' (y, n, pnta, dk)
     1117    * '''Relatives suffered a stroke or CVA - ONXv2:00001''' (y, n, pnta, dk)
    11181118     * ![RiskFactorQuestionnaire: Have any of your relatives ever suffered a stroke or CVA]
    11191119      * Modifier: Father, Mother, Brother, Sister, Child
    11201120     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1121     * '''Relatives diagnosed with high blood pressure - ONX-00001''' (y, n, pnta, dk)
     1121    * '''Relatives diagnosed with high blood pressure - ONXv2:00001''' (y, n, pnta, dk)
    11221122     * ![RiskFactorQuestionnaire: Have any of your relatives been diagnosed with high blood pressure]
    11231123      * Modifier: Father, Mother, Brother, Sister, Child
    11241124     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1125     * '''Relatives diagnosed with valvular heart disease - ONX-00001''' (y, n, pnta, dk)
     1125    * '''Relatives diagnosed with valvular heart disease - ONXv2:00001''' (y, n, pnta, dk)
    11261126     * ![RiskFactorQuestionnaire: Have any of your relatives been diagnosed with valvular heart disease]
    11271127      * Modifier: Father, Mother, Brother, Sister, Child
    11281128     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    11291129
    1130     * '''Relatives age of onset of angina or Coronary Artery Disease - ONX-00001''' (numeric)
     1130    * '''Relatives age of onset of angina or Coronary Artery Disease - ONXv2:00001''' (numeric)
    11311131     * ![RiskFactorQuestionnaire: At what age did they first suffer from angina or Coronary Artery Disease]
    11321132      * Modifier: Father, Mother, Brother, Sister, Child
    11331133     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1134     * '''Relatives received treatment for angina or Coronary Artery Disease - ONX-00001''' (y, n, pnta, dk)
     1134    * '''Relatives received treatment for angina or Coronary Artery Disease - ONXv2:00001''' (y, n, pnta, dk)
    11351135     * ![RiskFactorQuestionnaire: Have they received treatment for their angina or Coronary Artery Disease]
    11361136      * Modifier: Father, Mother, Brother, Sister, Child
    11371137     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    11381138
    1139     * '''Relatives age of first heart attack or Myocardial Infarction - ONX-00001''' (numeric)
     1139    * '''Relatives age of first heart attack or Myocardial Infarction - ONXv2:00001''' (numeric)
    11401140     * ![RiskFactorQuestionnaire: At what age did they suffer their first heart attack or Myocardial Infarction]
    11411141      * Modifier: Father, Mother, Brother, Sister, Child
    11421142     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1143     * '''Relatives received treatment for heart attack or Myocardial Infarction - ONX-00001''' (y, n, pnta, dk)
     1143    * '''Relatives received treatment for heart attack or Myocardial Infarction - ONXv2:00001''' (y, n, pnta, dk)
    11441144     * ![RiskFactorQuestionnaire: Have they received treatment for their heart attack or Myocardial Infarction]
    11451145      * Modifier: Father, Mother, Brother, Sister, Child
    11461146     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    11471147
    1148     * '''Relatives age of first suffer from heart failure - ONX-00001''' (numeric)
     1148    * '''Relatives age of first suffer from heart failure - ONXv2:00001''' (numeric)
    11491149     * ![RiskFactorQuestionnaire: At what age did they first suffer from heart failure]
    11501150      * Modifier: Father, Mother, Brother, Sister, Child
    11511151     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1152     * '''Relatives received treatment for their heart failure - ONX-00001''' (y, n, pnta, dk)
     1152    * '''Relatives received treatment for their heart failure - ONXv2:00001''' (y, n, pnta, dk)
    11531153     * ![RiskFactorQuestionnaire: Have they received treatment for their heart failure]
    11541154      * Modifier: Father, Mother, Brother, Sister, Child
    11551155     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    11561156
    1157     * '''Relatives age of first suffer from Atrial Fibrillation - ONX-00001''' (numeric)
     1157    * '''Relatives age of first suffer from Atrial Fibrillation - ONXv2:00001''' (numeric)
    11581158     * ![RiskFactorQuestionnaire: At what age did they first suffer from Atrial Fibrillation]
    11591159      * Modifier: Father, Mother, Brother, Sister, Child
    11601160     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1161     * '''Relatives received treatment for their Atrial Fibrillation - ONX-00001''' (y, n, pnta, dk)
     1161    * '''Relatives received treatment for their Atrial Fibrillation - ONXv2:00001''' (y, n, pnta, dk)
    11621162     * ![RiskFactorQuestionnaire: Have they received treatment for their Atrial Fibrillation]
    11631163      * Modifier: Father, Mother, Brother, Sister, Child
    11641164     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    11651165
    1166     * '''Relatives age suffer their first stroke or CVA - ONX-00001''' (numeric)
     1166    * '''Relatives age suffer their first stroke or CVA - ONXv2:00001''' (numeric)
    11671167     * ![RiskFactorQuestionnaire: At what age did they suffer their first stroke or CVA]
    11681168      * Modifier: Father, Mother, Brother, Sister, Child
    11691169     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1170     * '''Relatives received treatment for the stroke or CVA - ONX-00001''' (y, n, pnta, dk)
     1170    * '''Relatives received treatment for the stroke or CVA - ONXv2:00001''' (y, n, pnta, dk)
    11711171     * ![RiskFactorQuestionnaire: Were they treated for the stroke or CVA]
    11721172      * Modifier: Father, Mother, Brother, Sister, Child
    11731173     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    11741174
    1175     * '''Relatives age first suffer from high blood pressure - ONX-00001''' (numeric)
     1175    * '''Relatives age first suffer from high blood pressure - ONXv2:00001''' (numeric)
    11761176     * ![RiskFactorQuestionnaire: At what age did they first suffer from high blood pressure]
    11771177      * Modifier: Father, Mother, Brother, Sister, Child
    11781178     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1179     * '''Relatives received treatment for high blood pressure - ONX-00001''' (y, n, pnta, dk)
     1179    * '''Relatives received treatment for high blood pressure - ONXv2:00001''' (y, n, pnta, dk)
    11801180     * ![RiskFactorQuestionnaire: Have they received treatment for their high blood pressure]
    11811181      * Modifier: Father, Mother, Brother, Sister, Child
    11821182     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    11831183
    1184     * '''Relatives age first suffer from valvular heart disease - ONX-00001''' (numeric)
     1184    * '''Relatives age first suffer from valvular heart disease - ONXv2:00001''' (numeric)
    11851185     * ![RiskFactorQuestionnaire: At what age did they first suffer from valvular heart disease]
    11861186      * Modifier: Father, Mother, Brother, Sister, Child
    11871187     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1188     * '''Relatives received treatment for valvular heart disease - ONX-00001''' (y, n, pnta, dk)
     1188    * '''Relatives received treatment for valvular heart disease - ONXv2:00001''' (y, n, pnta, dk)
    11891189     * ![RiskFactorQuestionnaire: Have they received treatment for their valvular heart disease]
    11901190      * Modifier: Father, Mother, Brother, Sister, Child
     
    11931193''The cause of relative's death is a tricky one.  Here are some options:''
    11941194
    1195     * '''Cause of close relative's death - ONX-00001''' (Leaf for each type)
     1195    * '''Cause of close relative's death - ONXv2:00001''' (Leaf for each type)
    11961196     * ![RiskFactorQuestionnaire: Do you know the cause of your xxxx's death]
    11971197      * Modifier: Father, Mother, Brother, Sister, Child
     
    12021202''Depending on how modifiers work, the filtering on age might not be adequate.  Another option:''
    12031203
    1204     * '''Age of close relative's death - ONX-00001''' (Numeric)
     1204    * '''Age of close relative's death - ONXv2:00001''' (Numeric)
    12051205     * ![RiskFactorQuestionnaire: At what age did they die]
    12061206      * Modifier: Father, Mother, Brother, Sister, Child
     
    12131213''An alternative would be to have both.''
    12141214
    1215    * '''Socio-Economic Factors - ONX-00001'''
    1216     * '''current marital status - ONX-00001''' (Enumerated List)
     1215   * '''Socio-Economic Factors - ONXv2:00001'''
     1216    * '''current marital status - ONXv2:00001''' (Enumerated List)
    12171217     * ![RiskFactorQuestionnaire: What is your current marital status]
    12181218     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
     
    12201220     * ![RiskFactorQuestionnaire: Do you live with a spouse or partner]
    12211221     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1222     * '''People living in household - ONX-00001''' (Numeric)
     1222    * '''People living in household - ONXv2:00001''' (Numeric)
    12231223     * ![RiskFactorQuestionnaire: How many people live in your household]
    12241224     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1225     * '''Employment status - ONX-00001''' (Enumerated List)
     1225    * '''Employment status - ONXv2:00001''' (Enumerated List)
    12261226     * ![RiskFactorQuestionnaire: What is your current work status]
    12271227     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1228     * '''Employment type - ONX-00001''' (Enumerated List)
     1228    * '''Employment type - ONXv2:00001''' (Enumerated List)
    12291229     * ![RiskFactorQuestionnaire: Which of the following best describes the work you do or did]
    12301230     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]
    1231     * '''Educational Status - ONX-00001''' (Enumerated List)
     1231    * '''Educational Status - ONXv2:00001''' (Enumerated List)
    12321232     * ![RiskFactorQuestionnaire: What was the highest level of education you completed]
    12331233     * Start Date: ![RiskFactorQuestionnaire: QuestionnaireRun.timeStart]