diff --git a/src/main/java/li/strolch/rest/RestfulStrolchComponent.java b/src/main/java/li/strolch/rest/RestfulStrolchComponent.java
index b50cd7f4a..0c08c1fec 100644
--- a/src/main/java/li/strolch/rest/RestfulStrolchComponent.java
+++ b/src/main/java/li/strolch/rest/RestfulStrolchComponent.java
@@ -38,7 +38,6 @@ public class RestfulStrolchComponent extends StrolchComponent {
 	public void start() {
 		DBC.PRE.assertNull("Instance is already set! This component is a singleton resource!", instance);
 		instance = this;
-
 		super.start();
 	}
 
diff --git a/src/main/java/li/strolch/rest/StrolchRestfulClasses.java b/src/main/java/li/strolch/rest/StrolchRestfulClasses.java
index 18e3aec68..3540dd3ce 100644
--- a/src/main/java/li/strolch/rest/StrolchRestfulClasses.java
+++ b/src/main/java/li/strolch/rest/StrolchRestfulClasses.java
@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import li.strolch.rest.endpoint.AuthenticationService;
+import li.strolch.rest.endpoint.EnumQuery;
 import li.strolch.rest.endpoint.Inspector;
 import li.strolch.rest.endpoint.VersionQuery;
 
@@ -36,6 +37,7 @@ public class StrolchRestfulClasses {
 		restfulClasses.add(AuthenticationService.class);
 		restfulClasses.add(Inspector.class);
 		restfulClasses.add(VersionQuery.class);
+		restfulClasses.add(EnumQuery.class);
 
 		Set<Class<?>> providerClasses = new HashSet<>();
 		providerClasses.add(StrolchRestfulExceptionMapper.class);
diff --git a/src/main/java/li/strolch/rest/endpoint/EnumQuery.java b/src/main/java/li/strolch/rest/endpoint/EnumQuery.java
new file mode 100644
index 000000000..78de753fa
--- /dev/null
+++ b/src/main/java/li/strolch/rest/endpoint/EnumQuery.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2013 Robert von Burg <eitch@eitchnet.ch>
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package li.strolch.rest.endpoint;
+
+import java.util.Locale;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import li.strolch.rest.RestfulStrolchComponent;
+import li.strolch.runtime.query.enums.EnumHandler;
+import li.strolch.runtime.query.enums.StrolchEnum;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Robert von Burg <eitch@eitchnet.ch>
+ */
+@Path("strolch/enums")
+public class EnumQuery {
+
+	private static final Logger logger = LoggerFactory.getLogger(EnumQuery.class);
+
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	@Path("{name}")
+	public Response getEnum(@PathParam("name") String name) {
+		try {
+
+			EnumHandler enumHandler = RestfulStrolchComponent.getInstance().getContainer()
+					.getComponent(EnumHandler.class);
+			StrolchEnum strolchEnum = enumHandler.getEnum(name, Locale.getDefault());
+
+			GenericEntity<StrolchEnum> entity = new GenericEntity<StrolchEnum>(strolchEnum, StrolchEnum.class) {
+			};
+			return Response.ok().entity(entity).build();
+
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+			return Response.serverError().entity(e.getMessage()).build();
+		}
+	}
+}