diff --git a/Substrate/SubstrateCS/Source/BlockInfo.cs b/Substrate/SubstrateCS/Source/BlockInfo.cs
index 52cdd21..75fc832 100644
--- a/Substrate/SubstrateCS/Source/BlockInfo.cs
+++ b/Substrate/SubstrateCS/Source/BlockInfo.cs
@@ -37,9 +37,12 @@ namespace Substrate
         public const int BED = 26;
         public const int POWERED_RAIL = 27;
         public const int DETECTOR_RAIL = 28;
+        public const int STICKY_PISTON = 29;
         public const int COBWEB = 30;
         public const int TALL_GRASS = 31;
         public const int DEAD_SHRUB = 32;
+        public const int PISTON = 33;
+        public const int PISTON_HEAD = 34;
         public const int WOOL = 35;
         public const int YELLOW_FLOWER = 37;
         public const int RED_ROSE = 38;
@@ -336,9 +339,12 @@ namespace Substrate
         public static BlockInfo Bed;
         public static BlockInfo PoweredRail;
         public static BlockInfo DetectorRail;
+        public static BlockInfo StickyPiston;
         public static BlockInfo Cobweb;
         public static BlockInfo TallGrass;
         public static BlockInfo DeadShrub;
+        public static BlockInfo Piston;
+        public static BlockInfo PistonHead;
         public static BlockInfo Wool;
         public static BlockInfo YellowFlower;
         public static BlockInfo RedRose;
@@ -440,9 +446,12 @@ namespace Substrate
             Bed = new BlockInfo(26, "Bed").SetOpacity(0);
             PoweredRail = new BlockInfo(27, "Powered Rail").SetOpacity(0).SetState(BlockState.NONSOLID);
             DetectorRail = new BlockInfo(28, "Detector Rail").SetOpacity(0).SetState(BlockState.NONSOLID);
+            StickyPiston = new BlockInfo(29, "Sticky Piston").SetOpacity(0);
             Cobweb = new BlockInfo(30, "Cobweb").SetOpacity(0).SetState(BlockState.NONSOLID);
             TallGrass = new BlockInfo(31, "Tall Grass").SetOpacity(0).SetState(BlockState.NONSOLID);
             DeadShrub = new BlockInfo(32, "Dead Shrub").SetOpacity(0).SetState(BlockState.NONSOLID);
+            Piston = new BlockInfo(33, "Piston").SetOpacity(0);
+            PistonHead = new BlockInfo(34, "Piston Head").SetOpacity(0);
             Wool = new BlockInfo(35, "Wool");
             YellowFlower = new BlockInfo(37, "Yellow Flower").SetOpacity(0).SetState(BlockState.NONSOLID);
             RedRose = new BlockInfo(38, "Red Rose").SetOpacity(0).SetState(BlockState.NONSOLID);
@@ -551,6 +560,9 @@ namespace Substrate
             Crops.SetDataLimits(0, 7, 0);
             PoweredRail.SetDataLimits(0, 5, 0x8);
             DetectorRail.SetDataLimits(0, 5, 0x8);
+            StickyPiston.SetDataLimits(1, 5, 0x8);
+            Piston.SetDataLimits(1, 5, 0x8);
+            PistonHead.SetDataLimits(1, 5, 0x8);
             Wool.SetDataLimits(0, 15, 0);
             Torch.SetDataLimits(1, 5, 0);
             RedstoneTorch.SetDataLimits(0, 5, 0);
diff --git a/Substrate/SubstrateCS/Source/Data.cs b/Substrate/SubstrateCS/Source/Data.cs
index ae64f2d..514d39d 100644
--- a/Substrate/SubstrateCS/Source/Data.cs
+++ b/Substrate/SubstrateCS/Source/Data.cs
@@ -48,7 +48,7 @@ namespace Substrate
         FLOW_3 = 6,
     }
 
-    [FlagsAttribute]
+    [Flags]
     public enum LiquidState
     {
         FALLING = 0x08,
@@ -63,7 +63,7 @@ namespace Substrate
         NORTHWEST = 3,
     }
 
-    [FlagsAttribute]
+    [Flags]
     public enum DoorState
     {
         SWUNG = 0x04,
@@ -123,7 +123,7 @@ namespace Substrate
         ASCEND_WEST = 5,
     }
 
-    [FlagsAttribute]
+    [Flags]
     public enum PoweredRailState
     {
         POWERED = 0x08,
@@ -155,7 +155,7 @@ namespace Substrate
         GROUND_NORTHSOUTH = 6,
     }
 
-    [FlagsAttribute]
+    [Flags]
     public enum LeverState
     {
         POWERED = 0x08,
@@ -169,7 +169,7 @@ namespace Substrate
         NORTH = 4,
     }
 
-    [FlagsAttribute]
+    [Flags]
     public enum ButtonState
     {
         PRESSED = 0x08,
@@ -219,7 +219,7 @@ namespace Substrate
         NORTH = 3,
     }
 
-    [FlagsAttribute]
+    [Flags]
     public enum PressurePlateState
     {
         PRESSED = 0x01,
@@ -251,7 +251,7 @@ namespace Substrate
         PIECES_1 = 5,
     }
 
-    [FlagsAttribute]
+    [Flags]
     public enum BedState
     {
         HEAD = 0x08,
@@ -288,6 +288,27 @@ namespace Substrate
         NORTH = 3,
     }
 
+    public enum PistonOrientation
+    {
+        UP = 1,
+        EAST = 2,
+        WEST = 3,
+        NORTH = 4,
+        SOUTH = 5,
+    }
+
+    [Flags]
+    public enum PistonBodyState
+    {
+        EXTENDED = 0x08,
+    }
+
+    [Flags]
+    public enum PistonHeadState
+    {
+        STICKY = 0x08,
+    }
+
     // Item Data
 
     public enum CoalType
diff --git a/Substrate/SubstrateCS/Source/ItemInfo.cs b/Substrate/SubstrateCS/Source/ItemInfo.cs
index 9ff6789..bfc4e45 100644
--- a/Substrate/SubstrateCS/Source/ItemInfo.cs
+++ b/Substrate/SubstrateCS/Source/ItemInfo.cs
@@ -111,6 +111,7 @@ namespace Substrate
         public const int REDSTONE_REPEATER = 356;
         public const int COOKIE = 357;
         public const int MAP = 358;
+        public const int SHEARS = 359;
         public const int GOLD_MUSIC_DISC = 2256;
         public const int GREEN_MUSIC_DISC = 2257;
     }
@@ -292,6 +293,7 @@ namespace Substrate
         public static ItemInfo RedstoneRepeater;
         public static ItemInfo Cookie;
         public static ItemInfo Map;
+        public static ItemInfo Shears;
         public static ItemInfo GoldMusicDisc;
         public static ItemInfo GreenMusicDisc;
 
@@ -404,6 +406,7 @@ namespace Substrate
             RedstoneRepeater = new ItemInfo(356, "Redstone Repeater").SetStackSize(64);
             Cookie = new ItemInfo(357, "Cookie").SetStackSize(8);
             Map = new ItemInfo(358, "Map");
+            Shears = new ItemInfo(359, "Shears");
             GoldMusicDisc = new ItemInfo(2256, "Gold Music Disc");
             GreenMusicDisc = new ItemInfo(2257, "Green Music Disc");
         }