diff --git a/src/Machete.X12Schema/V5010/Layouts/F827.cs b/src/Machete.X12Schema/V5010/Layouts/F827.cs
new file mode 100644
index 00000000..2be20df7
--- /dev/null
+++ b/src/Machete.X12Schema/V5010/Layouts/F827.cs
@@ -0,0 +1,15 @@
+namespace Machete.X12Schema.V5010
+{
+    using X12;
+
+
+    public interface F827 :
+        X12Layout
+    {
+        Segment<ISA> InterchangeControlHeader { get; }
+
+        LayoutList<T827> Transaction { get; }
+
+        Segment<IEA> InterchangeControlTrailer { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Machete.X12Schema/V5010/Layouts/LoopNM1_827.cs b/src/Machete.X12Schema/V5010/Layouts/LoopNM1_827.cs
new file mode 100644
index 00000000..51cf51b1
--- /dev/null
+++ b/src/Machete.X12Schema/V5010/Layouts/LoopNM1_827.cs
@@ -0,0 +1,21 @@
+namespace Machete.X12Schema.V5010
+{
+    using X12;
+
+
+    public interface LoopNM1_827 :
+        X12Layout
+    {
+        Segment<NM1> IndividualOrOrganizationName { get; }
+
+        SegmentList<N2> AdditionalNameInformation { get; }
+
+        SegmentList<N3> AddressInformation { get; }
+
+        Segment<N4> GeographicInformation { get; }
+
+        SegmentList<REF> ReferenceIdentification { get; }
+
+        SegmentList<PER> AdministrativeCommunicationsContact { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Machete.X12Schema/V5010/Layouts/Maps/LoopNM1_827Map.cs b/src/Machete.X12Schema/V5010/Layouts/Maps/LoopNM1_827Map.cs
new file mode 100644
index 00000000..02a2ee18
--- /dev/null
+++ b/src/Machete.X12Schema/V5010/Layouts/Maps/LoopNM1_827Map.cs
@@ -0,0 +1,23 @@
+namespace Machete.X12Schema.V5010.Maps
+{
+    using X12;
+    using X12.Configuration;
+
+
+    public class LoopNM1_827Map :
+        X12LayoutMap<LoopNM1_827, X12Entity>
+    {
+        public LoopNM1_827Map()
+        {
+            Id = "Loop_NM1_827";
+            Name = "Loop NM1";
+
+            Segment(x => x.IndividualOrOrganizationName, 0);
+            Segment(x => x.AdditionalNameInformation, 1);
+            Segment(x => x.AddressInformation, 2);
+            Segment(x => x.GeographicInformation, 3);
+            Segment(x => x.ReferenceIdentification, 4);
+            Segment(x => x.AdministrativeCommunicationsContact, 5);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Machete.X12Schema/V5010/Layouts/Maps/T827Map.cs b/src/Machete.X12Schema/V5010/Layouts/Maps/T827Map.cs
new file mode 100644
index 00000000..20355d28
--- /dev/null
+++ b/src/Machete.X12Schema/V5010/Layouts/Maps/T827Map.cs
@@ -0,0 +1,27 @@
+namespace Machete.X12Schema.V5010.Maps
+{
+    using X12;
+    using X12.Configuration;
+
+
+    public class T827Map :
+        X12LayoutMap<T827, X12Entity>
+    {
+        public T827Map()
+        {
+            Id = "T827";
+            Name = "827 Financial Return Notice";
+
+            Segment(x => x.FunctionalGroupHeader, 0);
+            Segment(x => x.TransactionSetHeader, 1);
+            Segment(x => x.FinancialReturn, 2);
+            Segment(x => x.Currency, 3);
+            Segment(x => x.Trace, 4);
+            Segment(x => x.ReferenceInformation, 5);
+            Segment(x => x.DateOrTimeReference, 6);
+            Layout(x => x.LoopNM1, 7);
+            Segment(x => x.TransactionSetTrailer, 8);
+            Segment(x => x.FunctionalGroupTrailer, 9);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Machete.X12Schema/V5010/Layouts/T827.cs b/src/Machete.X12Schema/V5010/Layouts/T827.cs
new file mode 100644
index 00000000..81728dee
--- /dev/null
+++ b/src/Machete.X12Schema/V5010/Layouts/T827.cs
@@ -0,0 +1,29 @@
+namespace Machete.X12Schema.V5010
+{
+    using X12;
+
+
+    public interface T827 :
+        X12Layout
+    {
+        Segment<GS> FunctionalGroupHeader { get; }
+
+        Segment<ST> TransactionSetHeader { get; }
+
+        Segment<RIC> FinancialReturn { get; }
+
+        Segment<CUR> Currency { get; }
+
+        SegmentList<TRN> Trace { get; }
+
+        SegmentList<REF> ReferenceInformation { get; }
+
+        SegmentList<DTM> DateOrTimeReference { get; }
+
+        LayoutList<LoopNM1_827> LoopNM1 { get; }
+
+        Segment<SE> TransactionSetTrailer { get; }
+
+        Segment<GE> FunctionalGroupTrailer { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Machete.X12Schema/V5010/Segments/Maps/RICMap.cs b/src/Machete.X12Schema/V5010/Segments/Maps/RICMap.cs
new file mode 100644
index 00000000..9d2c82c2
--- /dev/null
+++ b/src/Machete.X12Schema/V5010/Segments/Maps/RICMap.cs
@@ -0,0 +1,39 @@
+namespace Machete.X12Schema.V5010.Maps
+{
+    using X12;
+    using X12.Configuration;
+    using X12.Values.Converters;
+
+
+    public class RICMap :
+        X12SegmentMap<RIC, X12Entity>
+    {
+        public RICMap()
+        {
+            Id = "RIC";
+            Name = "Financial Return";
+            Value(x => x.PaymentMethodCode, 1, x => x.FixedLength(3));
+            Value(x => x.CodeListQualifierCode, 2, x => x.MinLength(1).MaxLength(3));
+            Value(x => x.IndustryCode, 3, x => x.MinLength(1).MaxLength(30));
+            Value(x => x.MonetaryAmount, 4, x => x.MinLength(1).MaxLength(18).IsRequired());
+            Value(x => x.CreditDebitFlagCode, 5, x => x.FixedLength(1).IsRequired());
+            Value(x => x.AccountNumber1, 6, x => x.MinLength(1).MaxLength(35));
+            Value(x => x.AccountNumberQualifier1, 7, x => x.MinLength(1).MaxLength(3));
+            Value(x => x.IdNumberQualifier1, 8, x => x.FixedLength(2));
+            Value(x => x.IdentifierNumber1, 9, x => x.MinLength(3).MaxLength(12));
+            Value(x => x.AccountNumber2, 10, x => x.MinLength(1).MaxLength(35));
+            Value(x => x.AccountNumberQualifier2, 11, x => x.MinLength(1).MaxLength(3));
+            Value(x => x.IdNumberQualifier2, 12, x => x.FixedLength(2));
+            Value(x => x.IdentifierNumber2, 13, x => x.MinLength(3).MaxLength(12));
+            Value(x => x.AccountNumber3, 14, x => x.MinLength(1).MaxLength(35));
+            Value(x => x.AccountNumberQualifier3, 15, x => x.MinLength(1).MaxLength(3));
+            Value(x => x.IdNumberQualifier3, 16, x => x.FixedLength(2));
+            Value(x => x.IdentifierNumber3, 17, x => x.MinLength(3).MaxLength(12));
+            Value(x => x.Date, 18, x =>
+            {
+                x.FixedLength(8);
+                x.Converter = X12ValueConverters.VariableDate;
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Machete.X12Schema/V5010/Segments/RIC.cs b/src/Machete.X12Schema/V5010/Segments/RIC.cs
new file mode 100644
index 00000000..2f5ee60c
--- /dev/null
+++ b/src/Machete.X12Schema/V5010/Segments/RIC.cs
@@ -0,0 +1,29 @@
+namespace Machete.X12Schema.V5010
+{
+    using System;
+    using X12;
+
+
+    public interface RIC :
+        X12Segment
+    {
+        Value<string> PaymentMethodCode { get; }
+        Value<string> CodeListQualifierCode { get; }
+        Value<string> IndustryCode { get; }
+        Value<string> MonetaryAmount { get; }
+        Value<string> CreditDebitFlagCode { get; }
+        Value<string> AccountNumber1 { get; }
+        Value<string> AccountNumberQualifier1 { get; }
+        Value<string> IdNumberQualifier1 { get; }
+        Value<string> IdentifierNumber1 { get; }
+        Value<string> AccountNumber2 { get; }
+        Value<string> AccountNumberQualifier2 { get; }
+        Value<string> IdNumberQualifier2 { get; }
+        Value<string> IdentifierNumber2 { get; }
+        Value<string> AccountNumber3 { get; }
+        Value<string> AccountNumberQualifier3 { get; }
+        Value<string> IdNumberQualifier3 { get; }
+        Value<string> IdentifierNumber3 { get; }
+        Value<DateTime> Date { get; }
+    }
+}
\ No newline at end of file