diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainCategorical.java b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainCategorical.java
index 9fde6778c..7b1ee5f78 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainCategorical.java
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainCategorical.java
@@ -28,6 +28,7 @@
  * <p>
  * Used in Swagger schema generation for chart axis descriptions.
  */
+@Schema(description = "Domain of values supported on a categorical chart axis.")
 public class AxisDomainCategorical implements AxisDomain {
 
     private final @NonNull Set<String> categories;
@@ -46,9 +47,9 @@ public AxisDomainCategorical(
     }
 
     @Override
-    @Schema(description = "Type of axis domain", requiredMode = RequiredMode.REQUIRED)
+    @Schema(description = "Type of axis domain: 'categorical'", requiredMode = RequiredMode.REQUIRED)
     public String getType() {
-        return "categorical";
+        return "categorical"; //$NON-NLS-1$
     }
 
     /**
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainRange.java b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainRange.java
index 65ecc7d9e..0efb31c9b 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainRange.java
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainRange.java
@@ -23,6 +23,7 @@
  * <p>
  * Used in Swagger schema generation for chart axis descriptions.
  */
+@Schema(description = "Domain of values supported on a numberical range chart axis.")
 public class AxisDomainRange implements AxisDomain {
 
     private final long start;
@@ -45,9 +46,9 @@ public AxisDomainRange(
     }
 
     @Override
-    @Schema(description = "Type of axis domain", requiredMode = RequiredMode.REQUIRED)
+    @Schema(description = "Type of axis domain: 'range'", requiredMode = RequiredMode.REQUIRED)
     public String getType() {
-        return "range";
+        return "range"; //$NON-NLS-1$
     }
 
     /**
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/XYAxisDescription.java b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/XYAxisDescription.java
index 16fea0cd0..b22a081ba 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/XYAxisDescription.java
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/XYAxisDescription.java
@@ -51,6 +51,9 @@ public interface XYAxisDescription {
      * @return Optional domain of values that this axis can take.
      */
     @JsonProperty("axisDomain")
-    @Schema(description = "Optional domain of values that this axis supports", requiredMode = RequiredMode.NOT_REQUIRED)
-    @Nullable AxisDomain getAxisDomain();
+    @Schema(description = "Optional domain of values that this axis supports", requiredMode = RequiredMode.NOT_REQUIRED, oneOf = {
+            AxisDomainCategorical.class,
+            AxisDomainRange.class
+    })
+    @Nullable Object getAxisDomain();
 }