diff --git a/csharp/Facebook.CSSLayout/CSSNode.cs b/csharp/Facebook.CSSLayout/CSSNode.cs
index bd825ae8..e83204c1 100644
--- a/csharp/Facebook.CSSLayout/CSSNode.cs
+++ b/csharp/Facebook.CSSLayout/CSSNode.cs
@@ -253,18 +253,9 @@ namespace Facebook.CSSLayout
             }
         }
 
-        public Spacing GetMargin()
+        public float GetMargin(CSSEdge edge)
         {
-
-            var margin = new Spacing();
-            margin.Set(Spacing.Left, Native.CSSNodeStyleGetMargin(_cssNode, CSSEdge.Left));
-            margin.Set(Spacing.Top, Native.CSSNodeStyleGetMargin(_cssNode, CSSEdge.Top));
-            margin.Set(Spacing.Right, Native.CSSNodeStyleGetMargin(_cssNode, CSSEdge.Right));
-            margin.Set(Spacing.Bottom, Native.CSSNodeStyleGetMargin(_cssNode, CSSEdge.Bottom));
-            margin.Set(Spacing.Start, Native.CSSNodeStyleGetMargin(_cssNode, CSSEdge.Start));
-            margin.Set(Spacing.End, Native.CSSNodeStyleGetMargin(_cssNode, CSSEdge.End));
-
-            return margin;
+            return Native.CSSNodeStyleGetMargin(_cssNode, edge);
         }
 
         public void SetMargin(CSSEdge edge, float value)
@@ -272,18 +263,9 @@ namespace Facebook.CSSLayout
             Native.CSSNodeStyleSetMargin(_cssNode, edge, value);
         }
 
-        public Spacing GetPadding()
+        public float GetPadding(CSSEdge edge)
         {
-
-            var padding = new Spacing();
-            padding.Set(Spacing.Left, Native.CSSNodeStyleGetPadding(_cssNode, CSSEdge.Left));
-            padding.Set(Spacing.Top, Native.CSSNodeStyleGetPadding(_cssNode, CSSEdge.Top));
-            padding.Set(Spacing.Right, Native.CSSNodeStyleGetPadding(_cssNode, CSSEdge.Right));
-            padding.Set(Spacing.Bottom, Native.CSSNodeStyleGetPadding(_cssNode, CSSEdge.Bottom));
-            padding.Set(Spacing.Start, Native.CSSNodeStyleGetPadding(_cssNode, CSSEdge.Start));
-            padding.Set(Spacing.End, Native.CSSNodeStyleGetPadding(_cssNode, CSSEdge.End));
-
-            return padding;
+            return Native.CSSNodeStyleGetPadding(_cssNode, edge);
         }
 
         public void SetPadding(CSSEdge edge, float padding)
@@ -291,18 +273,9 @@ namespace Facebook.CSSLayout
             Native.CSSNodeStyleSetPadding(_cssNode, edge, padding);
         }
 
-        public Spacing GetBorder()
+        public float GetBorder(CSSEdge edge)
         {
-
-            var border = new Spacing();
-            border.Set(Spacing.Left, Native.CSSNodeStyleGetBorder(_cssNode, CSSEdge.Left));
-            border.Set(Spacing.Top, Native.CSSNodeStyleGetBorder(_cssNode, CSSEdge.Top));
-            border.Set(Spacing.Right, Native.CSSNodeStyleGetBorder(_cssNode, CSSEdge.Right));
-            border.Set(Spacing.Bottom, Native.CSSNodeStyleGetBorder(_cssNode, CSSEdge.Bottom));
-            border.Set(Spacing.Start, Native.CSSNodeStyleGetBorder(_cssNode, CSSEdge.Start));
-            border.Set(Spacing.End, Native.CSSNodeStyleGetBorder(_cssNode, CSSEdge.End));
-
-            return border;
+            return Native.CSSNodeStyleGetBorder(_cssNode, edge);
         }
 
         public void SetBorder(CSSEdge edge, float border)
@@ -310,18 +283,9 @@ namespace Facebook.CSSLayout
             Native.CSSNodeStyleSetBorder(_cssNode, edge, border);
         }
 
-        public Spacing GetPosition()
+        public float GetPosition(CSSEdge edge)
         {
-
-            var position = new Spacing();
-            position.Set(Spacing.Left, Native.CSSNodeStyleGetPosition(_cssNode, CSSEdge.Left));
-            position.Set(Spacing.Top, Native.CSSNodeStyleGetPosition(_cssNode, CSSEdge.Top));
-            position.Set(Spacing.Right, Native.CSSNodeStyleGetPosition(_cssNode, CSSEdge.Right));
-            position.Set(Spacing.Bottom, Native.CSSNodeStyleGetPosition(_cssNode, CSSEdge.Bottom));
-            position.Set(Spacing.Start, Native.CSSNodeStyleGetPosition(_cssNode, CSSEdge.Start));
-            position.Set(Spacing.End, Native.CSSNodeStyleGetPosition(_cssNode, CSSEdge.End));
-
-            return position;
+            return Native.CSSNodeStyleGetPosition(_cssNode, edge);
         }
 
         public void SetPosition(CSSEdge edge, float position)
diff --git a/java/com/facebook/csslayout/CSSNode.java b/java/com/facebook/csslayout/CSSNode.java
index eb263dfb..59d5b350 100644
--- a/java/com/facebook/csslayout/CSSNode.java
+++ b/java/com/facebook/csslayout/CSSNode.java
@@ -303,15 +303,8 @@ public class CSSNode implements CSSNodeAPI<CSSNode> {
 
   private native float jni_CSSNodeStyleGetMargin(long nativePointer, int edge);
   @Override
-  public Spacing getMargin() {
-    Spacing margin = new Spacing();
-    margin.set(Spacing.LEFT, jni_CSSNodeStyleGetMargin(mNativePointer, Spacing.LEFT));
-    margin.set(Spacing.TOP, jni_CSSNodeStyleGetMargin(mNativePointer, Spacing.TOP));
-    margin.set(Spacing.RIGHT, jni_CSSNodeStyleGetMargin(mNativePointer, Spacing.RIGHT));
-    margin.set(Spacing.BOTTOM, jni_CSSNodeStyleGetMargin(mNativePointer, Spacing.BOTTOM));
-    margin.set(Spacing.START, jni_CSSNodeStyleGetMargin(mNativePointer, Spacing.START));
-    margin.set(Spacing.END, jni_CSSNodeStyleGetMargin(mNativePointer, Spacing.END));
-    return margin;
+  public float getMargin(int spacingType) {
+    return jni_CSSNodeStyleGetMargin(mNativePointer, spacingType);
   }
 
   private native void jni_CSSNodeStyleSetMargin(long nativePointer, int edge, float margin);
@@ -322,15 +315,8 @@ public class CSSNode implements CSSNodeAPI<CSSNode> {
 
   private native float jni_CSSNodeStyleGetPadding(long nativePointer, int edge);
   @Override
-  public Spacing getPadding() {
-    Spacing padding = new Spacing();
-    padding.set(Spacing.LEFT, jni_CSSNodeStyleGetPadding(mNativePointer, Spacing.LEFT));
-    padding.set(Spacing.TOP, jni_CSSNodeStyleGetPadding(mNativePointer, Spacing.TOP));
-    padding.set(Spacing.RIGHT, jni_CSSNodeStyleGetPadding(mNativePointer, Spacing.RIGHT));
-    padding.set(Spacing.BOTTOM, jni_CSSNodeStyleGetPadding(mNativePointer, Spacing.BOTTOM));
-    padding.set(Spacing.START, jni_CSSNodeStyleGetPadding(mNativePointer, Spacing.START));
-    padding.set(Spacing.END, jni_CSSNodeStyleGetPadding(mNativePointer, Spacing.END));
-    return padding;
+  public float getPadding(int spacingType) {
+    return jni_CSSNodeStyleGetPadding(mNativePointer, spacingType);
   }
 
   private native void jni_CSSNodeStyleSetPadding(long nativePointer, int edge, float padding);
@@ -341,15 +327,8 @@ public class CSSNode implements CSSNodeAPI<CSSNode> {
 
   private native float jni_CSSNodeStyleGetBorder(long nativePointer, int edge);
   @Override
-  public Spacing getBorder() {
-    Spacing border = new Spacing();
-    border.set(Spacing.LEFT, jni_CSSNodeStyleGetBorder(mNativePointer, Spacing.LEFT));
-    border.set(Spacing.TOP, jni_CSSNodeStyleGetBorder(mNativePointer, Spacing.TOP));
-    border.set(Spacing.RIGHT, jni_CSSNodeStyleGetBorder(mNativePointer, Spacing.RIGHT));
-    border.set(Spacing.BOTTOM, jni_CSSNodeStyleGetBorder(mNativePointer, Spacing.BOTTOM));
-    border.set(Spacing.START, jni_CSSNodeStyleGetBorder(mNativePointer, Spacing.START));
-    border.set(Spacing.END, jni_CSSNodeStyleGetBorder(mNativePointer, Spacing.END));
-    return border;
+  public float getBorder(int spacingType) {
+    return jni_CSSNodeStyleGetBorder(mNativePointer, spacingType);
   }
 
   private native void jni_CSSNodeStyleSetBorder(long nativePointer, int edge, float border);
@@ -360,15 +339,8 @@ public class CSSNode implements CSSNodeAPI<CSSNode> {
 
   private native float jni_CSSNodeStyleGetPosition(long nativePointer, int edge);
   @Override
-  public Spacing getPosition() {
-    Spacing position = new Spacing();
-    position.set(Spacing.LEFT, jni_CSSNodeStyleGetPosition(mNativePointer, Spacing.LEFT));
-    position.set(Spacing.TOP, jni_CSSNodeStyleGetPosition(mNativePointer, Spacing.TOP));
-    position.set(Spacing.RIGHT, jni_CSSNodeStyleGetPosition(mNativePointer, Spacing.RIGHT));
-    position.set(Spacing.BOTTOM, jni_CSSNodeStyleGetPosition(mNativePointer, Spacing.BOTTOM));
-    position.set(Spacing.START, jni_CSSNodeStyleGetPosition(mNativePointer, Spacing.START));
-    position.set(Spacing.END, jni_CSSNodeStyleGetPosition(mNativePointer, Spacing.END));
-    return position;
+  public float getPosition(int spacingType) {
+    return jni_CSSNodeStyleGetPosition(mNativePointer, spacingType);
   }
 
   private native void jni_CSSNodeStyleSetPosition(long nativePointer, int edge, float position);
diff --git a/java/com/facebook/csslayout/CSSNodeAPI.java b/java/com/facebook/csslayout/CSSNodeAPI.java
index 3af4ddb5..95ac5718 100644
--- a/java/com/facebook/csslayout/CSSNodeAPI.java
+++ b/java/com/facebook/csslayout/CSSNodeAPI.java
@@ -59,13 +59,13 @@ public interface CSSNodeAPI<CSSNodeType extends CSSNodeAPI> {
   void setFlexShrink(float flexShrink);
   float getFlexBasis();
   void setFlexBasis(float flexBasis);
-  Spacing getMargin();
+  float getMargin(int spacingType);
   void setMargin(int spacingType, float margin);
-  Spacing getPadding();
+  float getPadding(int spacingType);
   void setPadding(int spacingType, float padding);
-  Spacing getBorder();
+  float getBorder(int spacingType);
   void setBorder(int spacingType, float border);
-  Spacing getPosition();
+  float getPosition(int spacingType);
   void setPosition(int spacingType, float position);
   float getStyleWidth();
   void setStyleWidth(float width);
diff --git a/java/com/facebook/csslayout/CSSNodeDEPRECATED.java b/java/com/facebook/csslayout/CSSNodeDEPRECATED.java
index 7d357cc0..ae7d4476 100644
--- a/java/com/facebook/csslayout/CSSNodeDEPRECATED.java
+++ b/java/com/facebook/csslayout/CSSNodeDEPRECATED.java
@@ -413,8 +413,8 @@ public class CSSNodeDEPRECATED implements CSSNodeAPI<CSSNodeDEPRECATED> {
    * Get this node's margin, as defined by style + default margin.
    */
   @Override
-  public Spacing getMargin() {
-    return style.margin;
+  public float getMargin(int spacingType) {
+    return style.margin.get(spacingType);
   }
 
   @Override
@@ -428,8 +428,8 @@ public class CSSNodeDEPRECATED implements CSSNodeAPI<CSSNodeDEPRECATED> {
    * Get this node's padding, as defined by style + default padding.
    */
   @Override
-  public Spacing getPadding() {
-    return style.padding;
+  public float getPadding(int spacingType) {
+    return style.padding.get(spacingType);
   }
 
   @Override
@@ -443,8 +443,8 @@ public class CSSNodeDEPRECATED implements CSSNodeAPI<CSSNodeDEPRECATED> {
    * Get this node's border, as defined by style.
    */
   @Override
-  public Spacing getBorder() {
-    return style.border;
+  public float getBorder(int spacingType) {
+    return style.border.get(spacingType);
   }
 
   @Override
@@ -458,8 +458,8 @@ public class CSSNodeDEPRECATED implements CSSNodeAPI<CSSNodeDEPRECATED> {
    * Get this node's position, as defined by style.
    */
   @Override
-  public Spacing getPosition() {
-    return style.position;
+  public float getPosition(int spacingType) {
+    return style.position.get(spacingType);
   }
 
   @Override