diff --git a/core/src/main/java/hudson/model/LabelExpression.java b/core/src/main/java/hudson/model/LabelExpression.java
new file mode 100644
index 0000000000000000000000000000000000000000..0971e326e997a3f5c99b1abc6b4349e40db3fa89
--- /dev/null
+++ b/core/src/main/java/hudson/model/LabelExpression.java
@@ -0,0 +1,15 @@
+package hudson.model;
+
+/**
+ * Boolean expression of labels.
+ * 
+ * @author Kohsuke Kawaguchi
+ * @since 1.COMPOSITELABEL
+ */
+public abstract class LabelExpression extends Label {
+
+
+    public static final class And extends LabelExpression {
+        private final Label lhs,rhs;
+    }
+}
diff --git a/core/src/main/java/hudson/model/LabelToken.java b/core/src/main/java/hudson/model/LabelToken.java
new file mode 100644
index 0000000000000000000000000000000000000000..3708556309cbe3ecb49e88d7fc2811f47fc62edb
--- /dev/null
+++ b/core/src/main/java/hudson/model/LabelToken.java
@@ -0,0 +1,13 @@
+package hudson.model;
+
+/**
+ * Atomic single token label, like "foo" or "bar".
+ * 
+ * @author Kohsuke Kawaguchi
+ * @since 1.COMPOSITELABEL
+ */
+public class LabelToken extends Label {
+    public LabelToken(String name) {
+        super(name);
+    }
+}