diff --git a/SMBLibrary/SMB1/TransactionSubcommands/TransactionCallNamedPipeRequest.cs b/SMBLibrary/SMB1/TransactionSubcommands/TransactionCallNamedPipeRequest.cs
index 6a562ca..d6929a1 100644
--- a/SMBLibrary/SMB1/TransactionSubcommands/TransactionCallNamedPipeRequest.cs
+++ b/SMBLibrary/SMB1/TransactionSubcommands/TransactionCallNamedPipeRequest.cs
@@ -23,7 +23,6 @@ namespace SMBLibrary.SMB1
 
         public TransactionCallNamedPipeRequest() : base()
         {
-
         }
 
         public TransactionCallNamedPipeRequest(byte[] setup, byte[] data) : base()
@@ -38,7 +37,7 @@ namespace SMBLibrary.SMB1
             byte[] setup = new byte[4];
             LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
             LittleEndianWriter.WriteUInt16(setup, 2, Priority);
-            return base.GetSetup();
+            return setup;
         }
 
         public override byte[] GetData()
diff --git a/SMBLibrary/SMB1/TransactionSubcommands/TransactionPeekNamedPipeRequest.cs b/SMBLibrary/SMB1/TransactionSubcommands/TransactionPeekNamedPipeRequest.cs
index 577aca1..3f7aff0 100644
--- a/SMBLibrary/SMB1/TransactionSubcommands/TransactionPeekNamedPipeRequest.cs
+++ b/SMBLibrary/SMB1/TransactionSubcommands/TransactionPeekNamedPipeRequest.cs
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -20,7 +20,8 @@ namespace SMBLibrary.SMB1
         public ushort FID;
 
         public TransactionPeekNamedPipeRequest() : base()
-        {}
+        {
+        }
 
         public TransactionPeekNamedPipeRequest(byte[] setup) : base()
         {
@@ -32,7 +33,7 @@ namespace SMBLibrary.SMB1
             byte[] setup = new byte[4];
             LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
             LittleEndianWriter.WriteUInt16(setup, 2, FID);
-            return base.GetSetup();
+            return setup;
         }
 
         public override TransactionSubcommandName SubcommandName
diff --git a/SMBLibrary/SMB1/TransactionSubcommands/TransactionQueryNamedPipeInfoRequest.cs b/SMBLibrary/SMB1/TransactionSubcommands/TransactionQueryNamedPipeInfoRequest.cs
index 26aea31..d51e7bc 100644
--- a/SMBLibrary/SMB1/TransactionSubcommands/TransactionQueryNamedPipeInfoRequest.cs
+++ b/SMBLibrary/SMB1/TransactionSubcommands/TransactionQueryNamedPipeInfoRequest.cs
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -37,7 +37,7 @@ namespace SMBLibrary.SMB1
             byte[] setup = new byte[4];
             LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
             LittleEndianWriter.WriteUInt16(setup, 2, FID);
-            return base.GetSetup();
+            return setup;
         }
 
         public override byte[] GetParameters(bool isUnicode)
diff --git a/SMBLibrary/SMB1/TransactionSubcommands/TransactionRawReadNamedPipeRequest.cs b/SMBLibrary/SMB1/TransactionSubcommands/TransactionRawReadNamedPipeRequest.cs
index c60bbc8..f8454e2 100644
--- a/SMBLibrary/SMB1/TransactionSubcommands/TransactionRawReadNamedPipeRequest.cs
+++ b/SMBLibrary/SMB1/TransactionSubcommands/TransactionRawReadNamedPipeRequest.cs
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -33,7 +33,7 @@ namespace SMBLibrary.SMB1
             byte[] setup = new byte[4];
             LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
             LittleEndianWriter.WriteUInt16(setup, 2, FID);
-            return base.GetSetup();
+            return setup;
         }
 
         public override TransactionSubcommandName SubcommandName
diff --git a/SMBLibrary/SMB1/TransactionSubcommands/TransactionRawWriteNamedPipeRequest.cs b/SMBLibrary/SMB1/TransactionSubcommands/TransactionRawWriteNamedPipeRequest.cs
index c37afab..0e2e221 100644
--- a/SMBLibrary/SMB1/TransactionSubcommands/TransactionRawWriteNamedPipeRequest.cs
+++ b/SMBLibrary/SMB1/TransactionSubcommands/TransactionRawWriteNamedPipeRequest.cs
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -24,6 +24,7 @@ namespace SMBLibrary.SMB1
         public TransactionRawWriteNamedPipeRequest() : base()
         {
         }
+
         public TransactionRawWriteNamedPipeRequest(byte[] setup, byte[] data) : base()
         {
             FID = LittleEndianConverter.ToUInt16(setup, 2);
@@ -36,7 +37,7 @@ namespace SMBLibrary.SMB1
             byte[] setup = new byte[4];
             LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
             LittleEndianWriter.WriteUInt16(setup, 2, FID);
-            return base.GetSetup();
+            return setup;
         }
 
         public override byte[] GetData()
diff --git a/SMBLibrary/SMB1/TransactionSubcommands/TransactionReadNamedPipeRequest.cs b/SMBLibrary/SMB1/TransactionSubcommands/TransactionReadNamedPipeRequest.cs
index febaecc..0b3bc6f 100644
--- a/SMBLibrary/SMB1/TransactionSubcommands/TransactionReadNamedPipeRequest.cs
+++ b/SMBLibrary/SMB1/TransactionSubcommands/TransactionReadNamedPipeRequest.cs
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -20,7 +20,8 @@ namespace SMBLibrary.SMB1
         public ushort FID;
 
         public TransactionReadNamedPipeRequest() : base()
-        {}
+        {
+        }
 
         public TransactionReadNamedPipeRequest(byte[] setup): base()
         {
@@ -32,7 +33,7 @@ namespace SMBLibrary.SMB1
             byte[] setup = new byte[4];
             LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
             LittleEndianWriter.WriteUInt16(setup, 2, FID);
-            return base.GetSetup();
+            return setup;
         }
 
         public override TransactionSubcommandName SubcommandName
diff --git a/SMBLibrary/SMB1/TransactionSubcommands/TransactionSetNamedPipeStateRequest.cs b/SMBLibrary/SMB1/TransactionSubcommands/TransactionSetNamedPipeStateRequest.cs
index bd87402..b051bd8 100644
--- a/SMBLibrary/SMB1/TransactionSubcommands/TransactionSetNamedPipeStateRequest.cs
+++ b/SMBLibrary/SMB1/TransactionSubcommands/TransactionSetNamedPipeStateRequest.cs
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -37,7 +37,7 @@ namespace SMBLibrary.SMB1
             byte[] setup = new byte[4];
             LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
             LittleEndianWriter.WriteUInt16(setup, 2, FID);
-            return base.GetSetup();
+            return setup;
         }
 
         public override byte[] GetParameters(bool isUnicode)
diff --git a/SMBLibrary/SMB1/TransactionSubcommands/TransactionTransactNamedPipeRequest.cs b/SMBLibrary/SMB1/TransactionSubcommands/TransactionTransactNamedPipeRequest.cs
index 7016978..e634e60 100644
--- a/SMBLibrary/SMB1/TransactionSubcommands/TransactionTransactNamedPipeRequest.cs
+++ b/SMBLibrary/SMB1/TransactionSubcommands/TransactionTransactNamedPipeRequest.cs
@@ -36,7 +36,7 @@ namespace SMBLibrary.SMB1
             byte[] setup = new byte[4];
             LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
             LittleEndianWriter.WriteUInt16(setup, 2, FID);
-            return base.GetSetup();
+            return setup;
         }
 
         public override byte[] GetData()
diff --git a/SMBLibrary/SMB1/TransactionSubcommands/TransactionWaitNamedPipeRequest.cs b/SMBLibrary/SMB1/TransactionSubcommands/TransactionWaitNamedPipeRequest.cs
index 8f09338..e66c642 100644
--- a/SMBLibrary/SMB1/TransactionSubcommands/TransactionWaitNamedPipeRequest.cs
+++ b/SMBLibrary/SMB1/TransactionSubcommands/TransactionWaitNamedPipeRequest.cs
@@ -33,7 +33,7 @@ namespace SMBLibrary.SMB1
             byte[] setup = new byte[4];
             LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
             LittleEndianWriter.WriteUInt16(setup, 2, Priority);
-            return base.GetSetup();
+            return setup;
         }
 
         public override TransactionSubcommandName SubcommandName
diff --git a/SMBLibrary/SMB1/TransactionSubcommands/TransactionWriteNamedPipeRequest.cs b/SMBLibrary/SMB1/TransactionSubcommands/TransactionWriteNamedPipeRequest.cs
index 9341432..616df2a 100644
--- a/SMBLibrary/SMB1/TransactionSubcommands/TransactionWriteNamedPipeRequest.cs
+++ b/SMBLibrary/SMB1/TransactionSubcommands/TransactionWriteNamedPipeRequest.cs
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -28,6 +28,7 @@ namespace SMBLibrary.SMB1
         public TransactionWriteNamedPipeRequest(byte[] setup, byte[] data): base()
         {
             FID = LittleEndianConverter.ToUInt16(setup, 2);
+
             WriteData = data;
         }
 
@@ -36,7 +37,7 @@ namespace SMBLibrary.SMB1
             byte[] setup = new byte[4];
             LittleEndianWriter.WriteUInt16(setup, 0, (ushort)this.SubcommandName);
             LittleEndianWriter.WriteUInt16(setup, 2, FID);
-            return base.GetSetup();
+            return setup;
         }
 
         public override byte[] GetData()