diff --git a/record.py b/record.py
index ae82c98..4a61a05 100644
--- a/record.py
+++ b/record.py
@@ -118,35 +118,58 @@ class EmployeeWageRecord(model.Model):
     blank5 =                        BlankField(max_length=23)
 
 
-class EmployeeWageRecord(model.Model):
+class OptionalEmployeeWageRecord(model.Model):
     record_identifier =             StaticField(value='ro')
+    blank1 =                        BlankField(max_length=9)
+    allocated_tips =                NumericField(max_length=11)
+    uncollected_tax_on_tips = NumericField(max_length=11)
+    medical_savings_account =       NumericField(max_length=11)
+    simple_retirement_account =     NumericField(max_length=11)
+    qualified_adoption_expenses =   NumericField(max_length=11)
+    uncollected_ss_life_ins =       NumericField(max_length=11)
+    uncollected_medicare_life_ins = NumericField(max_length=11)
+    income_under_409a =             NumericField(max_length=11)
+    hire_exempt_wages_and_tips =    NumericField(max_length=11)
+    blank2 =                        BlankField(max_length=164)
+    wages_subject_to_puerto_rico_tax =          NumericField(max_length=11, required=False)
+    commissions_subject_to_puerto_rico_tax =    NumericField(max_length=11, required=False)
+    allowances_subject_to_puerto_rico_tax =     NumericField(max_length=11, required=False)
+    tips_subject_to_puerto_rico_tax =           NumericField(max_length=11, required=False)
+    total_wages_subject_to_puerto_rico_tax =    NumericField(max_length=11, required=False)
+    puerto_rico_tax_withheld =                  NumericField(max_length=11, required=False)
+    retirement_fund_contrib =                   NumericField(max_length=11, required=False)
+    blank3 =                                    BlankField(max_length=11)
+    total_wages_tips_virgin_islands =           NumericField(max_length=11, required=False)
+    virgin_islands_income_tax_withheld =        NumericField(max_length=11, required=False)
+    blank4 =                                    BlankField(max_length=128)
 
-class RTTotalRecord(model.Model):
+
+class TotalRecord(model.Model):
     record_identifier =             StaticField(value='rt')
 
-class RUTotalRecord(model.Model):
-    record_identifier =             StaticField(value='ru')
-    number_of_ro_records =          NumericField(max_length=7)
-    allocated_tips =                NumericField(max_length=15)
-    uncollected_tax_on_tips =       NumericField(max_length=15)
-    medical_savings_account =       NumericField(max_length=15)
-    simple_retirement_account =     NumericField(max_length=15)
-    qualified_adoption_expenses =   NumericField(max_length=15)
-    uncollected_ss_life_ins =       NumericField(max_length=15)
-    uncollected_medicare_life_ins = NumericField(max_length=15)
-    income_under_409a =             NumericField(max_length=15)
-    hire_exempt_wages_and_tips =    NumericField(max_length=15)
-    blank1 =                        BlankField(max_length=210)
-    wages_subject_to_puerto_rico_tax = NumericField(max_length=15, required=False)
-    commissions_subject_to_puerto_rico_tax = NumericField(max_length=15, required=False)
-    allowances_subject_to_puerto_rico_tax = NumericField(max_length=15, required=False)
-    tips_subject_to_puerto_rico_tax = NumericField(max_length=15, required=False)
-    total_wages_subject_to_puerto_rico_tax = NumericField(max_length=15, required=False)
-    puerto_rico_tax_withheld =      NumericField(max_length=15, required=False)
-    retirement_fund_contrib =       NumericField(max_length=15, required=False)
-    total_wages_tips_virgin_islands=NumericField(max_length=15, required=False)
-    virgin_islands_income_tax_withheld = NumericField(max_length=15, required=False)
-    blank2 =                        BlankField(max_length=23)
+class OptionalTotalRecord(model.Model):
+    record_identifier =                         StaticField(value='ru')
+    number_of_ro_records =                      NumericField(max_length=7)
+    allocated_tips =                            NumericField(max_length=15)
+    uncollected_tax_on_tips =                   NumericField(max_length=15)
+    medical_savings_account =                   NumericField(max_length=15)
+    simple_retirement_account =                 NumericField(max_length=15)
+    qualified_adoption_expenses =               NumericField(max_length=15)
+    uncollected_ss_life_ins =                   NumericField(max_length=15)
+    uncollected_medicare_life_ins =             NumericField(max_length=15)
+    income_under_409a =                         NumericField(max_length=15)
+    hire_exempt_wages_and_tips =                NumericField(max_length=15)
+    blank1 =                                    BlankField(max_length=210)
+    wages_subject_to_puerto_rico_tax =          NumericField(max_length=15, required=False)
+    commissions_subject_to_puerto_rico_tax =    NumericField(max_length=15, required=False)
+    allowances_subject_to_puerto_rico_tax =     NumericField(max_length=15, required=False)
+    tips_subject_to_puerto_rico_tax =           NumericField(max_length=15, required=False)
+    total_wages_subject_to_puerto_rico_tax =    NumericField(max_length=15, required=False)
+    puerto_rico_tax_withheld =                  NumericField(max_length=15, required=False)
+    retirement_fund_contrib =                   NumericField(max_length=15, required=False)
+    total_wages_tips_virgin_islands =           NumericField(max_length=15, required=False)
+    virgin_islands_income_tax_withheld =        NumericField(max_length=15, required=False)
+    blank2 =                                    BlankField(max_length=23)
 
 
 class StateTotalRecord(model.Model):