diff --git a/jctools-core/src/main/java/org/jctools/queues/BaseLinkedQueue.java b/jctools-core/src/main/java/org/jctools/queues/BaseLinkedQueue.java
index c1720e1e..23ed03db 100644
--- a/jctools-core/src/main/java/org/jctools/queues/BaseLinkedQueue.java
+++ b/jctools-core/src/main/java/org/jctools/queues/BaseLinkedQueue.java
@@ -87,6 +87,11 @@ protected final LinkedQueueNode<E> lpConsumerNode() {
     }
 }
 
+abstract class BaseLinkedQueuePad2<E> extends BaseLinkedQueueConsumerNodeRef<E> {
+    long p01, p02, p03, p04, p05, p06, p07;
+    long p10, p11, p12, p13, p14, p15, p16, p17;
+}
+
 /**
  * A base data structure for concurrent linked queues. For convenience also pulled in common single consumer
  * methods since at this time there's no plan to implement MC.
@@ -95,9 +100,7 @@ protected final LinkedQueueNode<E> lpConsumerNode() {
  *
  * @param <E>
  */
-abstract class BaseLinkedQueue<E> extends BaseLinkedQueueConsumerNodeRef<E> {
-    long p01, p02, p03, p04, p05, p06, p07;
-    long p10, p11, p12, p13, p14, p15, p16, p17;
+abstract class BaseLinkedQueue<E> extends BaseLinkedQueuePad2<E> {
 
     @Override
     public final Iterator<E> iterator() {
diff --git a/jctools-core/src/main/java/org/jctools/queues/atomic/BaseLinkedAtomicQueue.java b/jctools-core/src/main/java/org/jctools/queues/atomic/BaseLinkedAtomicQueue.java
index f5de735c..ce8f2821 100644
--- a/jctools-core/src/main/java/org/jctools/queues/atomic/BaseLinkedAtomicQueue.java
+++ b/jctools-core/src/main/java/org/jctools/queues/atomic/BaseLinkedAtomicQueue.java
@@ -19,13 +19,63 @@
 
 import org.jctools.queues.MessagePassingQueue;
 
-abstract class BaseLinkedAtomicQueue<E> extends AbstractQueue<E> {
-    private static final AtomicReferenceFieldUpdater<BaseLinkedAtomicQueue, LinkedQueueAtomicNode> P_NODE_UPDATER = AtomicReferenceFieldUpdater.newUpdater(BaseLinkedAtomicQueue.class, LinkedQueueAtomicNode.class, "producerNode");
-    private static final AtomicReferenceFieldUpdater<BaseLinkedAtomicQueue, LinkedQueueAtomicNode> C_NODE_UPDATER = AtomicReferenceFieldUpdater.newUpdater(BaseLinkedAtomicQueue.class, LinkedQueueAtomicNode.class, "consumerNode");
+abstract class BaseLinkedAtomicQueuePad0<E> extends AbstractQueue<E> {
+    long p00, p01, p02, p03, p04, p05, p06, p07;
+    long p10, p11, p12, p13, p14, p15, p16;
+}
+
+abstract class BaseLinkedAtomicQueueProducerNodeRef<E> extends BaseLinkedAtomicQueuePad0<E> {
+    private static final AtomicReferenceFieldUpdater<BaseLinkedAtomicQueueProducerNodeRef, LinkedQueueAtomicNode> P_NODE_UPDATER = AtomicReferenceFieldUpdater.newUpdater(BaseLinkedAtomicQueueProducerNodeRef.class, LinkedQueueAtomicNode.class, "producerNode");
+
+    protected volatile LinkedQueueAtomicNode<E> producerNode;
+    
+    protected final void spProducerNode(LinkedQueueAtomicNode<E> node) {
+        P_NODE_UPDATER.lazySet(this, node);
+    }
+    
+    protected final LinkedQueueAtomicNode<E> lvProducerNode() {
+        return producerNode;
+    }
+    
+    protected final LinkedQueueAtomicNode<E> lpProducerNode() {
+        return lvProducerNode();
+    }
+    
+    protected final LinkedQueueAtomicNode<E> xchgProducerNode(LinkedQueueAtomicNode<E> node) {
+        return P_NODE_UPDATER.getAndSet(this, node);
+    }
+}
+
+abstract class BaseLinkedAtomicQueuePad1<E> extends BaseLinkedAtomicQueueProducerNodeRef<E> {
+    long p01, p02, p03, p04, p05, p06, p07;
+    long p10, p11, p12, p13, p14, p15, p16, p17;
+}
+
+abstract class BaseLinkedAtomicQueueConsumerNodeRef<E> extends BaseLinkedAtomicQueuePad1<E> {
+    private static final AtomicReferenceFieldUpdater<BaseLinkedAtomicQueueConsumerNodeRef, LinkedQueueAtomicNode> C_NODE_UPDATER = AtomicReferenceFieldUpdater.newUpdater(BaseLinkedAtomicQueueConsumerNodeRef.class, LinkedQueueAtomicNode.class, "consumerNode");
+
+    protected volatile LinkedQueueAtomicNode<E> consumerNode;
     
-    private volatile LinkedQueueAtomicNode<E> producerNode;
-    private volatile LinkedQueueAtomicNode<E> consumerNode;
+    protected final void spConsumerNode(LinkedQueueAtomicNode<E> node) {
+        C_NODE_UPDATER.lazySet(this, node);
+    }
+    
+    protected final LinkedQueueAtomicNode<E> lvConsumerNode() {
+        return consumerNode;
+    }
 
+    protected final LinkedQueueAtomicNode<E> lpConsumerNode() {
+        return lvConsumerNode();
+    }
+}
+
+abstract class BaseLinkedAtomicQueuePad2<E> extends BaseLinkedAtomicQueueConsumerNodeRef<E> {
+    long p01, p02, p03, p04, p05, p06, p07;
+    long p10, p11, p12, p13, p14, p15, p16, p17;
+}
+
+abstract class BaseLinkedAtomicQueue<E> extends BaseLinkedAtomicQueuePad2<E> {
+    
     @Override
     public final Iterator<E> iterator() {
         throw new UnsupportedOperationException();
@@ -99,32 +149,4 @@ protected E relaxedPeek() {
         }
         return null;
     }
-    
-    protected final LinkedQueueAtomicNode<E> lvProducerNode() {
-        return producerNode;
-    }
-    
-    protected final LinkedQueueAtomicNode<E> lpProducerNode() {
-        return lvProducerNode();
-    }
-    
-    protected final void spProducerNode(LinkedQueueAtomicNode<E> node) {
-        P_NODE_UPDATER.lazySet(this, node);
-    }
-    
-    protected final LinkedQueueAtomicNode<E> xchgProducerNode(LinkedQueueAtomicNode<E> node) {
-        return P_NODE_UPDATER.getAndSet(this, node);
-    }
-    
-    protected final LinkedQueueAtomicNode<E> lvConsumerNode() {
-        return consumerNode;
-    }
-
-    protected final LinkedQueueAtomicNode<E> lpConsumerNode() {
-        return lvConsumerNode();
-    }
-    
-    protected final void spConsumerNode(LinkedQueueAtomicNode<E> node) {
-        C_NODE_UPDATER.lazySet(this, node);
-    }
 }